retitle 769780 unblock: vmdebootstrap/0.5-1
thanks

The final debdiff is attached, including the changes described in
earlier plus the full details of the manpage changes to add information
to a bootloaders section.

unblock vmdebootstrap/0.5-1

-- 


Neil Williams
=============
http://www.linux.codehelp.co.uk/

diffstat for vmdebootstrap-0.4 vmdebootstrap-0.5

 debian/changelog   |   10 ++++++++++
 debian/control     |    4 ++--
 vmdebootstrap      |    4 ++--
 vmdebootstrap.8.in |   31 ++++++++++++++++++++-----------
 4 files changed, 34 insertions(+), 15 deletions(-)

diff -Nru vmdebootstrap-0.4/debian/changelog vmdebootstrap-0.5/debian/changelog
--- vmdebootstrap-0.4/debian/changelog	2014-10-21 09:04:55.000000000 +0100
+++ vmdebootstrap-0.5/debian/changelog	2014-11-16 15:27:52.000000000 +0000
@@ -1,3 +1,13 @@
+vmdebootstrap (0.5-1) unstable; urgency=medium
+
+  * New upstream bug fix release for Jessie.
+  * Allow parted to reserve space for grub2 on disk when
+    also using --bootsize option. (Closes: #767913)
+  * Move grub2-common to Recommends. (Closes: #767196)
+  * Add section on bootloaders to manpage.
+
+ -- Neil Williams <codeh...@debian.org>  Sun, 16 Nov 2014 15:11:34 +0000
+
 vmdebootstrap (0.4-3) unstable; urgency=medium
 
   * Fix syntax for excluding grub2-common on mips and s390x
diff -Nru vmdebootstrap-0.4/debian/control vmdebootstrap-0.5/debian/control
--- vmdebootstrap-0.4/debian/control	2014-10-21 09:04:55.000000000 +0100
+++ vmdebootstrap-0.5/debian/control	2014-11-16 15:27:52.000000000 +0000
@@ -17,10 +17,10 @@
 Architecture: linux-any
 Depends: debootstrap, qemu-utils,
  extlinux [amd64 i386],
- grub2-common [!mips !s390x], 
  kpartx, parted,
  python-cliapp, ${python:Depends}, ${misc:Depends}
-Recommends: squashfs-tools, qemu-system, qemu-user-static
+Recommends: grub2-common [!mips !s390x],
+ squashfs-tools, qemu-system, qemu-user-static
 Description: Bootstrap Debian into a (virtual machine) disk image
  vmdebootstrap is a wrapper around debootstrap to install Debian
  into a disk image, which can be used with a virtual machine (such as KVM).
diff -Nru vmdebootstrap-0.4/vmdebootstrap vmdebootstrap-0.5/vmdebootstrap
--- vmdebootstrap-0.4/vmdebootstrap	2014-10-18 19:35:19.000000000 +0100
+++ vmdebootstrap-0.5/vmdebootstrap	2014-11-16 15:10:24.000000000 +0000
@@ -27,7 +27,7 @@
 import time
 
 
-__version__ = '0.4'
+__version__ = '0.5'
 
 
 class VmDebootstrap(cliapp.Application):
@@ -245,7 +245,7 @@
         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 -Nru vmdebootstrap-0.4/vmdebootstrap.8.in vmdebootstrap-0.5/vmdebootstrap.8.in
--- vmdebootstrap-0.4/vmdebootstrap.8.in	2014-10-18 19:35:19.000000000 +0100
+++ vmdebootstrap-0.5/vmdebootstrap.8.in	2014-11-16 15:10:24.000000000 +0000
@@ -57,16 +57,30 @@
 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 @@
 .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

Attachment: pgpyxOlAy2slU.pgp
Description: OpenPGP digital signature

Reply via email to