From 1ce8413f4fae5ef8f527c4d3b63ed5e7322411c0 Mon Sep 17 00:00:00 2001
From: Neil Williams <codehelp@debian.org>
Date: Sun, 16 Nov 2014 15:10:24 +0000
Subject: [PATCH] Fix typo in bootsize partition space

Update manpage advice on bootloader options.
---
 vmdebootstrap      |  4 ++--
 vmdebootstrap.8.in | 31 ++++++++++++++++++++-----------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/vmdebootstrap b/vmdebootstrap
index 126475f..24e38d0 100755
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -27,7 +27,7 @@ import tempfile
 import time
 
 
-__version__ = '0.4'
+__version__ = '0.5'
 
 
 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'],
-                         'mkpart', 'primary', 'fat16', '0', bootsize])
+                         'mkpart', 'primary', 'fat16', '0%', bootsize])
         else:
             bootsize = '0%'
         self.runcmd(['parted', '-s', self.settings['image'],
diff --git a/vmdebootstrap.8.in b/vmdebootstrap.8.in
index cde170b..60e08cd 100644
--- 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.
-Then start the virtual machine,
+Then start the virtual machine, (see
+.B EXAMPLES
+)
 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.
-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
@@ -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
-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
-- 
2.39.5