From: Neil Williams <codehelp@debian.org>
Date: Sun, 13 Sep 2015 12:56:53 +0000 (+0100)
Subject: Merge branch 'bugs'
X-Git-Url: https://git.siccegge.de//index.cgi?p=forks%2Fvmdebootstrap.git;a=commitdiff_plain;h=cf4dc75495793ccda7d69ef2e6ee51a62d72669a;hp=-c

Merge branch 'bugs'
---

cf4dc75495793ccda7d69ef2e6ee51a62d72669a
diff --combined vmdebootstrap
index 4c3aefc,c10d633..4894bae
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@@ -125,7 -125,10 +125,10 @@@ class VmDebootstrap(cliapp.Application)
              '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 +644,11 @@@
                  '--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'],
@@@ -1017,12 -1024,14 +1024,12 @@@ append initrd=%(initrd)s root=UUID=%(uu
          logging.debug(
              "%s usage: %s", self.settings['image'],
              self.runcmd(['du', self.settings['image']]))
 -        with open('/dev/tty', 'w') as tty:
 -            try:
 +        try:
 +            with open('/dev/tty', 'w') as tty:
                  cliapp.runcmd([script, rootdir, self.settings['image']], stdout=tty, stderr=tty)
 -            except IOError:
 -                subprocess.call([script, rootdir, self.settings['image']])
 -        logging.debug(
 -            "%s usage: %s", self.settings['image'],
 -            self.runcmd(['du', self.settings['image']]))
 +        except IOError:
 +            logging.debug('tty unavailable, trying in headless mode.')
 +            subprocess.call([script, rootdir, self.settings['image']])
  
      def create_tarball(self, rootdir):
          # Create a tarball of the disk's contents