summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorNeil Williams <codehelp@debian.org>2015-09-14 18:21:16 +0100
committerNeil Williams <codehelp@debian.org>2015-09-14 18:21:16 +0100
commitb924bd6ee80c9779d41a2bfc0ca44034101859c6 (patch)
tree2c1bb69611e008b0e8162876e8157298b546cc1a /bin
parent657d1c56a2ca55986ac561c9d01b9710d2e302ff (diff)
downloadvmdebootstrap-b924bd6ee80c9779d41a2bfc0ca44034101859c6.tar.gz
fix missing distro lookup in uefi settings
Diffstat (limited to 'bin')
-rwxr-xr-xbin/vmdebootstrap8
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/vmdebootstrap b/bin/vmdebootstrap
index b5f60ef..210b94c 100755
--- a/bin/vmdebootstrap
+++ b/bin/vmdebootstrap
@@ -101,7 +101,7 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth
'using provided program (ie binfmt handler)')
self.settings.string_list(
['debootstrapopts'],
- 'pass additional options to debootstrap'),
+ 'pass additional options to debootstrap')
self.settings.boolean(
['extlinux'], 'install extlinux?',
default=True)
@@ -212,7 +212,9 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth
'%s is not a valid Debian or Ubuntu suite or codename.'
% self.settings['distribution'])
uefi = self.handlers[Uefi.name]
- uefi.check_settings()
+ oldstable = distro.was_oldstable(datetime.date(2015, 4, 26))
+ uefi.check_settings(oldstable=oldstable)
+
if os.geteuid() != 0:
sys.exit("You need to have root privileges to run this script.")
self.start_ops()
@@ -463,7 +465,7 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth
for opt in self.settings['debootstrapopts']:
for part in opt.split(' '):
args.append('--%s' % part)
- self.logging.debug("debootstrap arguments: %s", args)
+ logging.debug("debootstrap arguments: %s", args)
args += [self.settings['distribution'],
rootdir, self.settings['mirror']]
logging.debug(" ".join(args))