X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FInstallBootstrapFS.py;h=2c49acc5ad8c8cbc1daa5bcb520facbbb13310b1;hb=9807dbe301e4e078c07bff4df81ff33811a5cca7;hp=b9862ef745ec51e36259a45cab66c0d16af1b914;hpb=662b49c8efbe89581f6adda297e51dcdd8bfbfa4;p=bootmanager.git diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py index b9862ef..2c49acc 100644 --- a/source/steps/InstallBootstrapFS.py +++ b/source/steps/InstallBootstrapFS.py @@ -73,7 +73,7 @@ def Run( vars, log ): log.write( "Missing partition in PARTITIONS: %s\n" % part ) return 0 - bs_request= BootServerRequest.BootServerRequest() + bs_request= BootServerRequest.BootServerRequest(vars) log.write( "turning on swap space\n" ) utils.sysexec( "swapon %s" % PARTITIONS["swap"], log ) @@ -229,8 +229,7 @@ def Run( vars, log ): utils.sysexec("gpg --homedir=/root --export --armor" \ " --no-default-keyring --keyring %s/usr/boot/pubring.gpg" \ " >%s/etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab" % (SYSIMG_PATH, SYSIMG_PATH)) - utils.sysexec("chroot %s rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab" % \ - SYSIMG_PATH) + utils.sysexec_chroot(SYSIMG_PATH, "rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab") # the yum config has changed entirely; # in addition yum installs have more or less never worked - let's forget about this