Fix typo in bootsize partition space

Update manpage advice on bootloader options.

diff --git a/vmdebootstrap b/vmdebootstrap
index 126475fbf7d4af2e32b1eb5fff4bb59435317517..24e38d0aad73e4db4e8d50dd7ce255c4d9c36d09 100755 (executable)
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -27,7 +27,7 @@ import tempfile
 import time
 
 
 import time
 
 

-__version__ = '0.4'
+__version__ = '0.5'

 
 
 class VmDebootstrap(cliapp.Application):
 
 
 class VmDebootstrap(cliapp.Application):


@@ -245,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'],
         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'],
         else:
             bootsize = '0%'
         self.runcmd(['parted', '-s', self.settings['image'],

diff --git a/vmdebootstrap.8.in b/vmdebootstrap.8.in
index cde170ba5840e6a5b57e78db48d0837d65890dd4..60e08cd52dfd7959ec91396cc5edb778726bab6c 100644 (file)
--- a/vmdebootstrap.8.in
+++ b/vmdebootstrap.8.in
@@ -57,16 +57,30 @@ virtualization technology, such as
 or
 .BR qemu (1).
 Configure the virtual machine to use the image you've created.
 or
 .BR qemu (1).
 Configure the virtual machine to use the image you've created.

-Then start the virtual machine,
+Then start the virtual machine, (see
+.B EXAMPLES
+)

 and log into it via its console to configure it.
 and log into it via its console to configure it.

-.PP
+The image has an empty root password and will not have networking
+configured by default. Set the root password before you configure
+networking.
+.SH BOOTLOADERS

 Unless the \-\-no\-extlinux or \-\-grub options are specified, the
 image will use
 .BR extlinux (1)
 as a boot loader.
 Unless the \-\-no\-extlinux or \-\-grub options are specified, the
 image will use
 .BR extlinux (1)
 as a boot loader.

-The image has an empty root password and will not have networking
-configured by default. Set the root password before you configure
-networking.
+.B bootsize
+is not recommended when using
+.B extlinux
+- use grub instead.
+Versions of grub2 in wheezy
+can fail to install in the VM, at which point vmdebootstrap will fall back to
+extlinux. It may still be possible to complete the installation of grub2 after
+booting the VM as the problem may be related to the need to use loopback
+devices during the grub-install operation. Details of the error will appear in the
+vmdebootstrap log file, if enabled with the \-\-log option. Note that
+.B grub-legacy
+is not supported.

 .SH OPTIONS
 .IP \-\-output=FILE
 write output to FILE, instead of standard output
 .SH OPTIONS
 .IP \-\-output=FILE
 write output to FILE, instead of standard output


@@ -136,12 +150,7 @@ the VM. Can be useful if debootstrap fails to create it automatically.
 .IP \-\-grub
 Disable extlinux installation and configure grub2 instead. grub2 will be added to
 the list of packages to install. update-grub will be called once the debootstrap is
 .IP \-\-grub
 Disable extlinux installation and configure grub2 instead. grub2 will be added to
 the list of packages to install. update-grub will be called once the debootstrap is

-complete and grub-install will be called in the image. Versions of grub2 in wheezy
-can fail to install in the VM, at which point vmdebootstrap will fall back to
-extlinux. It may still be possible to complete the installation of grub2 after
-booting the VM as the problem may be related to the need to use loopback
-devices during the grub-install operation. Details of the error will appear in the
-vmdebootstrap log file, if enabled with the \-\-log option.
+complete and grub-install will be called in the image.

 .SH Configuration files and settings:
 .IP \-\-dump-config
 write out the entire current configuration
 .SH Configuration files and settings:
 .IP \-\-dump-config
 write out the entire current configuration