Extend debootstrapopts support for multiple opts

diff --git a/vmdebootstrap b/vmdebootstrap
index 163ee41d59d3147c48265bb500fc6bcfd690c9df..c10d63348338f959823ecc32e4ef2be64b37e06a 100755 (executable)
--- 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 f7a4439fb7120a2bc5092a93d663e2c0cda6cf65..19f5adc6ea48b6286688546bd81639794499ed1c 100644 (file)
--- 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.