X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=NodeUpdate.py;h=d8e110a33405b7306eaa6ffe5f55277981b3276d;hb=cf3d42f46205c200f12877e14b5cc865fd87bb1c;hp=11742f9155516aac6cae4086b8600f9590160681;hpb=5be08f1456ee467428a61288258485d6fabfe6f4;p=nodeupdate.git

diff --git a/NodeUpdate.py b/NodeUpdate.py
index 11742f9..d8e110a 100644
--- a/NodeUpdate.py
+++ b/NodeUpdate.py
@@ -35,9 +35,11 @@ REBOOT_FLAG = '/etc/planetlab/update-reboot'
 # location of directory containing boot server ssl certs
 SSL_CERT_DIR='/mnt/cdrom/bootme/cacert/'
 
-# file containing list of extra groups to attempt to update,
-# if necessary.
-EXTRA_GROUPS_FILE= '/etc/planetlab/extra-node-groups'
+# file containing the list of extensions this node has, each
+# correspond to a package group in yum repository.
+# this is expected to be updated from the 'extensions tag' 
+# through the 'extensions.php' nodeconfig script
+EXTENSIONS_FILE='/etc/planetlab/extensions'
 
 # file containing a list of rpms that we should attempt to delete
 # before updating everything else. This list is not removed with 
@@ -161,31 +163,27 @@ class NodeUpdate:
         os.system( "%s %s %s -y update" %
                    (YUM_PATH, yum_options, sslcertdir) )
 
-        Message( "\nChecking for extra groups to update" )
-        if os.access(EXTRA_GROUPS_FILE, os.R_OK) and \
-           os.path.isfile(EXTRA_GROUPS_FILE):
-            extra_groups_contents= file(EXTRA_GROUPS_FILE).read()
-            extra_groups_contents= string.strip(extra_groups_contents)
-            if extra_groups_contents == "":
+        Message( "\nChecking for extra groups (extensions) to update" )
+        if os.access(EXTENSIONS_FILE, os.R_OK) and \
+           os.path.isfile(EXTENSIONS_FILE):
+            extensions_contents= file(EXTENSIONS_FILE).read()
+            extensions_contents= string.strip(extensions_contents)
+            if extensions_contents == "":
                 Message( "No extra groups found in file." )
             else:
-                for group in string.split(extra_groups_contents,"\n"):
+                extensions_contents.strip()
+                for extension in extensions_contents.split():
+                    group = "extension%s" % extension
                     Message( "\nUpdating %s group" % group )
                     os.system( "%s %s %s -y groupupdate \"%s\"" %
                                (YUM_PATH, yum_options, sslcertdir, group) )
         else:
-            Message( "No extra groups file found" )
+            Message( "No extensions file found" )
             
         if os.access(REBOOT_FLAG, os.R_OK) and os.path.isfile(REBOOT_FLAG) and self.doReboot:
             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." )