Fix typo in bootsize partition space

[forks/vmdebootstrap.git] / vmdebootstrap

diff --git a/vmdebootstrap b/vmdebootstrap
index bf82e3a305c64296a214b7e65ad443ad17e613ef..24e38d0aad73e4db4e8d50dd7ce255c4d9c36d09 100755 (executable)
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -27,7 +27,7 @@ import tempfile
 import time
 
 
-__version__ = '0.4'
+__version__ = '0.5'
 
 
 class VmDebootstrap(cliapp.Application):
@@ -60,7 +60,7 @@ class VmDebootstrap(cliapp.Application):
         self.settings.string(['mirror'],
                              'use MIRROR as package source (%default)',
                              metavar='URL',
-                             default='http://cdn.debian.net/debian/')
+                             default='http://http.debian.net/debian/')
         self.settings.string(['arch'], 'architecture to use (%default)',
                              metavar='ARCH',
                              default=default_arch)
@@ -112,6 +112,9 @@ class VmDebootstrap(cliapp.Application):
         self.settings.boolean(['grub'],
                               'Install and configure grub2 - disables '
                               'extlinux.')
+        self.settings.boolean(['sparse'],
+                'Dont fill the image with zeros to keep a sparse disk image',
+                default=False)
 
     def process_args(self, args):
         if not self.settings['image'] and not self.settings['tarball']:
@@ -242,7 +245,7 @@ class VmDebootstrap(cliapp.Application):
         if self.settings['bootsize'] and self.settings['bootsize'] is not '0%':
             bootsize = str(self.settings['bootsize'] / (1024 * 1024))
             self.runcmd(['parted', '-s', self.settings['image'],
-                         'mkpart', 'primary', 'fat16', '0', bootsize])
+                         'mkpart', 'primary', 'fat16', '0%', bootsize])
         else:
             bootsize = '0%'
         self.runcmd(['parted', '-s', self.settings['image'],
@@ -483,7 +486,7 @@ class VmDebootstrap(cliapp.Application):
             self.runcmd(['chroot', rootdir, 'update-grub'])
             self.runcmd(['chroot', rootdir, 'grub-install', install_dev])
         except cliapp.AppException as e:
-            self.message("Failed to configure grub2. Using extlinux.")
+            self.message("Failed. Is grub2-common installed? Using extlinux.")
         self.runcmd(['umount', os.path.join(rootdir, 'sys')])
         self.runcmd(['umount', os.path.join(rootdir, 'proc')])
         self.runcmd(['umount', os.path.join(rootdir, 'dev')])
@@ -545,9 +548,10 @@ append initrd=%(initrd)s root=UUID=%(uuid)s ro %(kserial)s
         """
         Filing up the image with zeros will increase its compression rate
         """
-        zeros = os.path.join(rootdir, 'ZEROS')
-        self.runcmd_unchecked(['dd', 'if=/dev/zero', 'of=' + zeros, 'bs=1M'])
-        self.runcmd(['rm', '-f', zeros])
+        if not self.settings['sparse']:
+            zeros = os.path.join(rootdir, 'ZEROS')
+            self.runcmd_unchecked(['dd', 'if=/dev/zero', 'of=' + zeros, 'bs=1M'])
+            self.runcmd(['rm', '-f', zeros])
 
     def squash(self):
         """