From d3d393bce9a2142826d4645c1e16ee9c4e475841 Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Sun, 13 Sep 2015 13:56:13 +0100 Subject: Extend debootstrapopts support for multiple opts --- bin/vmdebootstrap | 4 +++- man/vmdebootstrap.rst | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/vmdebootstrap b/bin/vmdebootstrap index c9a8175..0aecd6f 100755 --- a/bin/vmdebootstrap +++ b/bin/vmdebootstrap @@ -461,7 +461,9 @@ 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) + self.logging.debug("debootstrap arguments: %s", args) args += [self.settings['distribution'], rootdir, self.settings['mirror']] logging.debug(" ".join(args)) diff --git a/man/vmdebootstrap.rst b/man/vmdebootstrap.rst index 10a1301..397deaa 100644 --- a/man/vmdebootstrap.rst +++ b/man/vmdebootstrap.rst @@ -41,10 +41,12 @@ Options needs to be a valid Debian or Ubuntu release name or codename. --debootstrapopts="command=option,command=option" - Supply options and arguments to ``debootstrap``. + Supply options and arguments to ``debootstrap``, + separated by spaces. + e.g. --debootstrapopts="variant=buildd no-check-gpg components=main,contrib". See **debootstrap (1)** for more information. This - replaces the ``--variant`` support in previous versions - of :file:`vmdebootstrap`. + option replaces the ``--variant`` support in + previous versions. --package=PACKAGE install PACKAGE onto system --custom-package=DEB install package in DEB file onto system (not from mirror) -- cgit v1.2.1