From 0a48e950071e16d3df1dd140c1f667adfe33847d Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Sun, 13 Sep 2015 13:28:38 +0100 Subject: [PATCH] Extend debootstrapopts support for multiple opts --- vmdebootstrap | 3 ++- vmdebootstrap.8.in | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/vmdebootstrap b/vmdebootstrap index 163ee41..c10d633 100755 --- a/vmdebootstrap +++ b/vmdebootstrap @@ -646,7 +646,8 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth args.append('--foreign') if self.settings['debootstrapopts']: for opt in self.settings['debootstrapopts']: - args.append('--%s' % opt) + for part in opt.split(' '): + args.append('--%s' % part) elif self.settings['variant']: args.append('--variant') args.append(self.settings['variant']) diff --git a/vmdebootstrap.8.in b/vmdebootstrap.8.in index f7a4439..19f5adc 100644 --- a/vmdebootstrap.8.in +++ b/vmdebootstrap.8.in @@ -283,8 +283,9 @@ the list of packages to install. update-grub will be called once the debootstrap complete and grub-install will be called in the image. .IP \-\-debootstrapopts Pass additional options to debootstrap as a quoted list of options -and values, separated by commas. See debootstrap \-\-help and -debootstrap (1) for valid options. +and values, separated by spaces. +e.g. --debootstrapopts="variant=buildd no-check-gpg components=main,contrib". +See debootstrap \-\-help and debootstrap (1) for valid options. .IP \-\-no\-acpid Disable installation of acpid if not required, otherwise acpid will be installed if \-\-foreign is not used. -- 2.39.2