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=c8b93078a1050b8b198c9198710258c317cb72de

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

Conflicts:
	vmdebootstrap
---

diff --git a/vmdebootstrap b/vmdebootstrap
index 37b1b78..eb7d1b1 100755
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -37,6 +37,8 @@ class VmDebootstrap(cliapp.Application):
                                'create a disk image of size SIZE (%default)',
                                metavar='SIZE',
                                default='1G')
+        self.settings.string(['tarball'], "tar up the disk's contents in FILE",
+                             metavar='FILE')
         self.settings.string(['mirror'],
                              'use MIRROR as package source (%default)',
                              metavar='URL',
@@ -76,21 +78,26 @@ class VmDebootstrap(cliapp.Application):
                                 'to sudo group')
 
     def process_args(self, args):
-        if not self.settings['image']:
-            raise cliapp.AppException('You must give image filename.')
-        if not self.settings['size']:
-            raise cliapp.AppException('You must give image size.')
+        if not self.settings['image'] and not self.settings['tarball']:
+            raise cliapp.AppException('You must give disk image filename, '
+                                      'or tarball filename')
+        if self.settings['image'] and not self.settings['size']:
+            raise cliapp.AppException('If disk image is specified, '
+                                      'You must give image size.')
 
         self.remove_dirs = []
         self.mount_points = []
 
         try:
-            self.create_empty_image()
-            self.partition_image()
-            self.install_mbr()
-            rootdev = self.setup_kpartx()
-            self.mkfs(rootdev)
-            rootdir = self.mount(rootdev)
+            if self.settings['image']:
+                self.create_empty_image()
+                self.partition_image()
+                self.install_mbr()
+                rootdev = self.setup_kpartx()
+                self.mkfs(rootdev)
+                rootdir = self.mount(rootdev)
+            else:
+                rootdir = self.mkdtemp()
             self.debootstrap(rootdir)
             self.set_hostname(rootdir)
             self.create_fstab(rootdir)
@@ -100,7 +107,10 @@ class VmDebootstrap(cliapp.Application):
             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)
+            if self.settings['tarball']:
+                self.create_tarball(rootdir)
         except BaseException, e:
             self.message('EEEK! Something bad happened...')
             self.cleanup_system()
@@ -346,10 +356,11 @@ append initrd=%(initrd)s root=UUID=%(uuid)s ro quiet %(kserial)s
 
         self.message('Cleaning up')
 
-        for mount_point in self.mount_points:
-            self.runcmd(['umount', mount_point], ignore_fail=True)
+        if self.settings['image']:
+            for mount_point in self.mount_points:
+                self.runcmd(['umount', mount_point], ignore_fail=True)
 
-        self.runcmd(['kpartx', '-d', self.settings['image']], ignore_fail=True)
+            self.runcmd(['kpartx', '-d', self.settings['image']], ignore_fail=True)
         
         for dirname in self.remove_dirs:
             shutil.rmtree(dirname)
@@ -361,6 +372,12 @@ append initrd=%(initrd)s root=UUID=%(uuid)s ro quiet %(kserial)s
             with open('/dev/tty', 'w') as tty:
                 cliapp.runcmd([script, rootdir], stdout=tty, stderr=tty)
 
+    def create_tarball(self, rootdir):
+        # Create a tarball of the disk's contents
+        # shell out to runcmd since it more easily handles rootdir
+        self.message('Creating tarball of disk contents')
+        self.runcmd(['tar', '-cf', self.settings['tarball'], '-C', rootdir, '.'])
+
 
 if __name__ == '__main__':
     VmDebootstrap().run()