Removed reserved_pid hack. -g now prunes by default. Use -a as well to send all nodes.

tbsetup/ptopgen.in

@@ -458,16 +458,6 @@ if (defined($exempt_eid)) {
 	"(b.pid='$pid' and b.eid='$exempt_eid'))"; 
 }
 
-# In genimode exclude nodes with exclusion attribute.
-if ($genimode) {
-    $free_condition = "(nat1.attrvalue is null or nat1.attrvalue=0)";
-    
-    if ($pid && $MAINSITE) {
-	$free_condition = "($free_condition and ".
-	    "(np.reserved_pid is not null and np.reserved_pid='$pid'))";
-    }
-}
-
 # In shared mode, allow allocated nodes whose sharing_mode is set.
 if ($useshared) {
     $free_condition = "($free_condition or ".
@@ -481,6 +471,12 @@ if ($allnodes) {
     $free_condition = "1";
 }
 
+# In genimode exclude nodes with exclusion attribute.
+if ($genimode) {
+    $free_condition = "($free_condition and ".
+	"(nat1.attrvalue is null or nat1.attrvalue=0))";
+}
+
 $result =
     DBQueryFatal("select a.node_id,a.type,a.phys_nodeid,t.class,t.issubnode," .
 		 "a.def_boot_osid,(b.pid is not null and b.eid is not null), ".