git://git.onelab.eu
/
bootmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shebags mention python2 explicitly
[bootmanager.git]
/
source
/
steps
/
InstallBootstrapFS.py
diff --git
a/source/steps/InstallBootstrapFS.py
b/source/steps/InstallBootstrapFS.py
index
0442097
..
f06bc91
100644
(file)
--- a/
source/steps/InstallBootstrapFS.py
+++ b/
source/steps/InstallBootstrapFS.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
2
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
@@
-111,11
+111,11
@@
def Run(vars, upgrade, log):
utils.sysexec("mount -t {} {} {}/vservers"\
.format(fstype, PARTITIONS["vservers"], SYSIMG_PATH), log)
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.
# 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
vars['ROOT_MOUNTED'] = 1
@@
-277,7
+277,7
@@
def CleanupSysimgBeforeUpgrade(sysimg, target_nodefamily, log):
with open("{}/etc/planetlab/virt".format(sysimg)) as infile:
installed_virt = infile.read().strip()
except Exception as e:
with open("{}/etc/planetlab/virt".format(sysimg)) as infile:
installed_virt = infile.read().strip()
except Exception as e:
- print_exc()
+
traceback.
print_exc()
raise BootManagerException("Could not retrieve data about previous installation - cannot upgrade")
# moving from vservers to lxc also means another filesystem
raise BootManagerException("Could not retrieve data about previous installation - cannot upgrade")
# moving from vservers to lxc also means another filesystem