X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;f=vmdebootstrap;h=89739c59c0839a2ef9f1b98c6ce3635a89ca17fe;hb=29046cffac74613e27663a6d174dc1d106951556;hp=546742985f7ec6d936f8ddab8d258618a22ba1f5;hpb=cd21365ff16bb2a7224bd4815a7616a2aa639825;p=forks%2Fvmdebootstrap.git diff --git a/vmdebootstrap b/vmdebootstrap index 5467429..89739c5 100755 --- a/vmdebootstrap +++ b/vmdebootstrap @@ -20,7 +20,6 @@ import crypt import logging import os import re -import time import shutil import subprocess import tempfile @@ -33,9 +32,8 @@ __version__ = '0.3' class VmDebootstrap(cliapp.Application): def add_settings(self): - default_arch = self.runcmd( - ["dpkg", "--print-architecture"], - ignore_fail=False).strip() + default_arch = subprocess.check_output( + ["dpkg", "--print-architecture"]).strip() self.settings.boolean(['verbose'], 'report what is going on') self.settings.string(['image'], 'put created disk image in FILE', @@ -319,6 +317,7 @@ class VmDebootstrap(cliapp.Application): self.runcmd(args) if self.settings['foreign']: # First copy the binfmt handler over + self.message('Setting up binfmt handler') shutil.copy(self.settings['foreign'], '%s/usr/bin/' % rootdir) # Next, run the package install scripts etc. self.message('Running debootstrap second stage')