From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 3 Apr 2009 07:34:10 +0000 (+0000)
Subject: undo unintentional commit of untested, probably useless, maybe harmful code
X-Git-Tag: NodeUpdate-0.5-4~2
X-Git-Url: http://git.onelab.eu/?p=nodeupdate.git;a=commitdiff_plain;h=47049f839a9ed6f3ce8b34f4730e230cde498403

undo unintentional commit of untested, probably useless, maybe harmful code
---

diff --git a/NodeUpdate.py b/NodeUpdate.py
index 11742f9..3553035 100644
--- a/NodeUpdate.py
+++ b/NodeUpdate.py
@@ -180,12 +180,6 @@ class NodeUpdate:
             Message( "\nAt least one update requested the system be rebooted" )
             self.ClearRebootFlag()
             os.system( "/sbin/shutdown -r now" )
-            # in the case where shutdown would hang, e.g. b/c of an initscript 
-            # leave it 10 minutes and brute-force kill
-            DELAY=10*60
-            time.sleep(DELAY)
-            # bad, but not worse than a PCU-driven powercycle
-            os.system ("sync; sleep 1; sync; reboot")
 
     def RebuildRPMdb( self ):
         Message( "\nRebuilding RPM Database." )