diff options
author | Neil Williams <codehelp@debian.org> | 2015-09-13 13:56:53 +0100 |
---|---|---|
committer | Neil Williams <codehelp@debian.org> | 2015-09-13 13:56:53 +0100 |
commit | cf4dc75495793ccda7d69ef2e6ee51a62d72669a (patch) | |
tree | 76c61313cf9a5a6edf87c00a65f03173a7d84918 | |
parent | 402d266fec7acd75315e1ed38dcb0520002d9995 (diff) | |
parent | 0a48e950071e16d3df1dd140c1f667adfe33847d (diff) | |
download | vmdebootstrap-cf4dc75495793ccda7d69ef2e6ee51a62d72669a.tar.gz |
Merge branch 'bugs'
-rwxr-xr-x | vmdebootstrap | 11 | ||||
-rw-r--r-- | vmdebootstrap.8.in | 6 |
2 files changed, 15 insertions, 2 deletions
diff --git a/vmdebootstrap b/vmdebootstrap index 4c3aefc..4894bae 100755 --- a/vmdebootstrap +++ b/vmdebootstrap @@ -125,7 +125,10 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth 'set up foreign debootstrap environment using provided program (ie binfmt handler)') self.settings.string( ['variant'], - 'select debootstrap variant it not using the default') + 'select debootstrap variant if not using the default [deprecated]') + self.settings.string_list( + ['debootstrapopts'], + 'pass additional options to debootstrap'), self.settings.boolean( ['extlinux'], 'install extlinux?', @@ -641,7 +644,11 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth '--include=%s' % ','.join(include)) if self.settings['foreign']: args.append('--foreign') - if self.settings['variant']: + if self.settings['debootstrapopts']: + for opt in self.settings['debootstrapopts']: + for part in opt.split(' '): + args.append('--%s' % part) + elif self.settings['variant']: args.append('--variant') args.append(self.settings['variant']) args += [self.settings['distribution'], diff --git a/vmdebootstrap.8.in b/vmdebootstrap.8.in index 0364bed..19f5adc 100644 --- a/vmdebootstrap.8.in +++ b/vmdebootstrap.8.in @@ -30,6 +30,7 @@ vmdebootstrap \- install basic Debian system into virtual disk image [\-\-bootsize=BOOTSIZE] [\-\-boottype=FSTYPE] [\-\-roottype=FSTYPE] [\-\-foreign=PATH] [\-\-variant=VARIANT] [\-\-no-extlinux] [\-\-squash] [\-\-configure-apt] [\-\-grub] [\-\-apt-mirror] [\-\-pkglist] [\-\-use\-efi] [\-\-efi\-size] +[\-\-debootstrapopts] .SH DESCRIPTION .B vmdebootstrap installs a basic Debian system into a virtual disk image, @@ -280,6 +281,11 @@ available. Disable extlinux installation and configure grub2 instead. grub2 will be added to the list of packages to install. update-grub will be called once the debootstrap is 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 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. |