Log stdout also on errors.

[forks/vmdebootstrap.git] / vmdebootstrap

diff --git a/vmdebootstrap b/vmdebootstrap
index be3169b7e9276adfd8ad366c4db3d55d5c6d6edc..6d0578207e3934a4629224f6f25496549ba52255 100755 (executable)
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -41,6 +41,7 @@ class VmDebootstrap(cliapp.Application):
         self.settings.add_string_setting(['mirror'],
                                          'use MIRROR as package source '
                                             '(%default)',
+                                         metavar='URL',
                                      default='http://cdn.debian.net/debian/')
         self.settings.add_string_setting(['arch'],
                                          'architecture to use '
@@ -51,6 +52,8 @@ class VmDebootstrap(cliapp.Application):
                                          'release to use (%default)',
                                          metavar='NAME',
                                          default='stable')
+        self.settings.add_string_list_setting(['package'],
+                                              'install PACKAGE onto system')
 
     def process_args(self, args):
         if not self.settings['image']:
@@ -88,7 +91,7 @@ class VmDebootstrap(cliapp.Application):
                              **kwargs)
         out, err = p.communicate(stdin)
         if p.returncode != 0:
-            msg = 'command failed: %s\n%s' % (argv, err)
+            msg = 'command failed: %s\n%s\n%s' % (argv, out, err)
             logging.error(msg)
             if not ignore_fail:
                 raise cliapp.AppException(msg)
@@ -149,7 +152,7 @@ class VmDebootstrap(cliapp.Application):
             kernel_arch = self.settings['arch']
         kernel_image = 'linux-image-2.6-%s' % kernel_arch
 
-        include = [kernel_image]
+        include = [kernel_image] + self.settings['package']
 
         self.runcmd(['debootstrap', 
                      '--arch=%s' % self.settings['arch'],