From c5193fd1ea653cb9be2ef25a91bfbe881defe927 Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Mon, 31 Mar 2014 23:15:46 -0400 Subject: [PATCH] Support non-rpm distributions --- source/steps/InstallBootstrapFS.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py index 1cb0282..26fd0d3 100644 --- a/source/steps/InstallBootstrapFS.py +++ b/source/steps/InstallBootstrapFS.py @@ -191,12 +191,14 @@ def Run( vars, log ): utils.makedirs(SYSIMG_PATH + "/mnt/cdrom") shutil.copytree("/usr/bootme", SYSIMG_PATH + "/mnt/cdrom/bootme") - # Import the GPG key into the RPM database so that RPMS can be verified - utils.makedirs(SYSIMG_PATH + "/etc/pki/rpm-gpg") - 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), log) - utils.sysexec_chroot(SYSIMG_PATH, "rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab", log) + # ONE_PARTITION => new distribution type + if (vars['ONE_PARTITION']!='1'): + # Import the GPG key into the RPM database so that RPMS can be verified + utils.makedirs(SYSIMG_PATH + "/etc/pki/rpm-gpg") + 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), log) + utils.sysexec_chroot(SYSIMG_PATH, "rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab", log) # keep a log on the installed hdd stamp=file(SYSIMG_PATH + "/bm-install.txt",'w') -- 2.43.0