git://git.onelab.eu
/
nodeupdate.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into 0.5
[nodeupdate.git]
/
NodeUpdate.py
diff --git
a/NodeUpdate.py
b/NodeUpdate.py
index
21512f6
..
c6823fb
100644
(file)
--- a/
NodeUpdate.py
+++ b/
NodeUpdate.py
@@
-37,6
+37,8
@@
SSL_CERT_DIR='/mnt/cdrom/bootme/cacert/'
# file containing the list of extensions this node has, each
# correspond to a package group in yum repository.
# 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
EXTENSIONS_FILE='/etc/planetlab/extensions'
# file containing a list of rpms that we should attempt to delete
@@
-154,7
+156,7
@@
class NodeUpdate:
Message( "Unsupported, not using --verbose option" )
Message( "\nUpdating PlanetLab group" )
Message( "Unsupported, not using --verbose option" )
Message( "\nUpdating PlanetLab group" )
- os.system( "%s %s %s -y group
update
\"PlanetLab\"" %
+ os.system( "%s %s %s -y group
install
\"PlanetLab\"" %
(YUM_PATH, yum_options, sslcertdir) )
Message( "\nUpdating rest of system" )
(YUM_PATH, yum_options, sslcertdir) )
Message( "\nUpdating rest of system" )
@@
-173,7
+175,7
@@
class NodeUpdate:
for extension in extensions_contents.split():
group = "extension%s" % extension
Message( "\nUpdating %s group" % group )
for extension in extensions_contents.split():
group = "extension%s" % extension
Message( "\nUpdating %s group" % group )
- os.system( "%s %s %s -y group
update
\"%s\"" %
+ os.system( "%s %s %s -y group
install
\"%s\"" %
(YUM_PATH, yum_options, sslcertdir, group) )
else:
Message( "No extensions file found" )
(YUM_PATH, yum_options, sslcertdir, group) )
else:
Message( "No extensions file found" )