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?a=commitdiff_plain;h=2228e98ba0b34a0c4b525ddd0cb8f384d25a5991;p=forks%2Fvmdebootstrap.git

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

Conflicts:
	vmdebootstrap
---

2228e98ba0b34a0c4b525ddd0cb8f384d25a5991
diff --cc vmdebootstrap
index 5b4c62b,37b1b78..eb7d1b1
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@@ -106,11 -99,8 +106,11 @@@ class VmDebootstrap(cliapp.Application)
              self.create_users(rootdir)
              self.remove_udev_persistent_rules(rootdir)
              self.setup_networking(rootdir)
+             self.customize(rootdir)
 -            self.install_extlinux(rootdev, rootdir)
 +            if self.settings['image']:
 +                self.install_extlinux(rootdev, rootdir)
-             self.customize(rootdir)
 +            if self.settings['tarball']:
 +                self.create_tarball(rootdir)
          except BaseException, e:
              self.message('EEEK! Something bad happened...')
              self.cleanup_system()