diff options
Diffstat (limited to 'bin/vmdebootstrap')
| -rwxr-xr-x | bin/vmdebootstrap | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/bin/vmdebootstrap b/bin/vmdebootstrap index 352ea0a..c9a8175 100755 --- a/bin/vmdebootstrap +++ b/bin/vmdebootstrap @@ -99,9 +99,9 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth self.settings.string( ['foreign'], 'set up foreign debootstrap environment ' 'using provided program (ie binfmt handler)') - self.settings.string( - ['variant'], 'select debootstrap variant it not using ' - 'the default') + self.settings.string_list( + ['debootstrapopts'], + 'pass additional options to debootstrap'), self.settings.boolean( ['extlinux'], 'install extlinux?', default=True) @@ -447,11 +447,10 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth def debootstrap(self, rootdir): base = self.handlers[Base.name] - msg = "(%s)" % self.settings['variant'] if self.settings['variant'] else '' include = self._bootstrap_packages() base.message( - 'Debootstrapping %s [%s] %s' % ( - self.settings['distribution'], self.settings['arch'], msg)) + 'Debootstrapping %s [%s]' % ( + self.settings['distribution'], self.settings['arch'])) args = ['debootstrap', '--arch=%s' % self.settings['arch']] @@ -460,9 +459,9 @@ 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']: - args.append('--variant') - args.append(self.settings['variant']) + if self.settings['debootstrapopts']: + for opt in self.settings['debootstrapopts']: + args.append('--%s' % opt) args += [self.settings['distribution'], rootdir, self.settings['mirror']] logging.debug(" ".join(args)) |