From: Richard Maw <richard.maw@codethink.co.uk>
Date: Thu, 11 Oct 2012 09:54:26 +0000 (+0100)
Subject: Merge branch 'no-kernel-option' into tar-no-kernel
X-Git-Url: https://git.siccegge.de//index.cgi?p=forks%2Fvmdebootstrap.git;a=commitdiff_plain;h=2228e98ba0b34a0c4b525ddd0cb8f384d25a5991;hp=86ee1ce7aa6f9eeea296188c919f0af00f31fb21

Merge branch 'no-kernel-option' into tar-no-kernel

Conflicts:
	vmdebootstrap
---

diff --git a/vmdebootstrap b/vmdebootstrap
index 5b4c62b..eb7d1b1 100755
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -106,9 +106,9 @@ class VmDebootstrap(cliapp.Application):
             self.create_users(rootdir)
             self.remove_udev_persistent_rules(rootdir)
             self.setup_networking(rootdir)
+            self.customize(rootdir)
             if self.settings['image']:
                 self.install_extlinux(rootdev, rootdir)
-            self.customize(rootdir)
             if self.settings['tarball']:
                 self.create_tarball(rootdir)
         except BaseException, e:
@@ -198,12 +198,11 @@ class VmDebootstrap(cliapp.Application):
         if self.settings['sudo'] and 'sudo' not in include:
             include.append('sudo')
 
-        self.runcmd(['debootstrap', 
-                     '--arch=%s' % self.settings['arch'],
-                     '--include=%s' % ','.join(include),
-                     self.settings['distribution'],
-                     rootdir, 
-                     self.settings['mirror']])
+        args = ['debootstrap', '--arch=%s' % self.settings['arch']]
+        if include: args.append('--include=%s' % ','.join(include))
+        args += [self.settings['distribution'],
+                 rootdir, self.settings['mirror']]
+        self.runcmd(args)
 
     def set_hostname(self, rootdir):
         hostname = self.settings['hostname']