undo unintentional commit of untested, probably useless, maybe harmful code
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 3 Apr 2009 07:34:10 +0000 (07:34 +0000)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 3 Apr 2009 07:34:10 +0000 (07:34 +0000)
NodeUpdate.py

index 11742f9..3553035 100644 (file)
@@ -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." )