From 205151d9aa12877f6783d02e90e622d65bd191f9 Mon Sep 17 00:00:00 2001
From: Leigh B Stoller <stoller@flux.utah.edu>
Date: Tue, 7 Dec 2010 11:18:15 -0700
Subject: [PATCH] Use new RES_REBOOT alloc state when we know that os_setup
 should reboot the node; do not rely on tbswap figuring this out; too fragile.

---
 tbsetup/assign_wrapper.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tbsetup/assign_wrapper.in b/tbsetup/assign_wrapper.in
index 1e7f473eb..3ca2731aa 100644
--- a/tbsetup/assign_wrapper.in
+++ b/tbsetup/assign_wrapper.in
@@ -1542,7 +1542,7 @@ sub RunAssign ()
 	    # Node is being reused, but for a different purpose, so
 	    # it should be rebooted.
 	    #
-	    TBSetNodeAllocState($pnode, TBDB_ALLOCSTATE_RES_INIT_DIRTY());
+	    TBSetNodeAllocState($pnode, TBDB_ALLOCSTATE_RES_REBOOT());
 	}
     }
     return 0;
@@ -1805,7 +1805,7 @@ foreach my $pnode (sort(keys(%virtnodes))) {
 	    elsif ($reserved_v2vmap{$virtual} ne $physical) {
 		# Node has moved! Nuts!
 		TBSetNodeAllocState($physical,
-				    TBDB_ALLOCSTATE_RES_INIT_DIRTY());
+				    TBDB_ALLOCSTATE_RES_REBOOT());
 	    }
 	}
     }
-- 
GitLab