diff options
author | Neil Williams <codehelp@debian.org> | 2015-09-13 13:39:49 +0100 |
---|---|---|
committer | Neil Williams <codehelp@debian.org> | 2015-09-13 13:39:49 +0100 |
commit | 402d266fec7acd75315e1ed38dcb0520002d9995 (patch) | |
tree | 44f68d06f6c7cd73d86473306b67d53649db97a3 | |
parent | 9aa3b05eb60c6af8678f38ba33ef04f52fb64a36 (diff) | |
download | vmdebootstrap-402d266fec7acd75315e1ed38dcb0520002d9995.tar.gz |
Reinstate headless support if there is no /dev/tty
-rwxr-xr-x | vmdebootstrap | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/vmdebootstrap b/vmdebootstrap index 138d8a6..4c3aefc 100755 --- a/vmdebootstrap +++ b/vmdebootstrap @@ -1017,14 +1017,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 |