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

Conflicts:
	vmdebootstrap

diff --cc vmdebootstrap
index 5b4c62bf4b5360f557a08f54b1dfbb3b2bbdea34,37b1b78972117d4f90eafed3dc750c0ac9b20ed8..eb7d1b1297e61d05300f66e403bb106d472f91bd
--- 1/vmdebootstrap
--- 2/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.install_extlinux(rootdev, rootdir)
+             self.customize(rootdir)
-             self.customize(rootdir)
 +            if self.settings['image']:
 +                self.install_extlinux(rootdev, rootdir)
 +            if self.settings['tarball']:
 +                self.create_tarball(rootdir)
          except BaseException, e:
              self.message('EEEK! Something bad happened...')
              self.cleanup_system()