-#!/usr/bin/python
+#!/usr/bin/python2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
utils.sysexec("mount -t {} {} {}/vservers"\
.format(fstype, PARTITIONS["vservers"], SYSIMG_PATH), log)
- if vars['virt']=='lxc':
+ #if vars['virt']=='lxc':
# NOTE: btrfs quota is supported from version: >= btrfs-progs-0.20 (f18+)
# older versions will not recongize the 'quota' command.
- log.write("Enabling btrfs quota on {}/vservers\n".format(SYSIMG_PATH))
- utils.sysexec_noerr("btrfs quota enable {}/vservers".format(SYSIMG_PATH))
+ #log.write("Enabling btrfs quota on {}/vservers\n".format(SYSIMG_PATH))
+ #utils.sysexec_noerr("btrfs quota enable {}/vservers".format(SYSIMG_PATH))
vars['ROOT_MOUNTED'] = 1
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 {}/usr/boot/pubring.gpg"
- " > {}/etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab".format(SYSIMG_PATH, SYSIMG_PATH), log)
+ # see also myplc/plc.d/gpg
+ utils.sysexec(
+ "type -p gpg1 >& /dev/null && GPG=gpg1 || GPG=gpg; "
+ "$GPG --homedir=/root --export --armor"
+ " --no-default-keyring --keyring {}/usr/boot/pubring.gpg"
+ " > {}/etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab"
+ .format(SYSIMG_PATH, SYSIMG_PATH), log, shell=True)
utils.sysexec_chroot(SYSIMG_PATH, "rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab", log)
# keep a log on the installed hdd