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=0a48e950071e16d3df1dd140c1f667adfe33847d

Merge branch 'bugs'
---

diff --git a/vmdebootstrap b/vmdebootstrap
index c10d633..4894bae 100755
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -1024,14 +1024,12 @@ append initrd=%(initrd)s root=UUID=%(uuid)s ro %(kserial)s
         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