Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package vmdebootstrap This release fixes a serious bug when images larger than ~1GB created with the default arguments wouldn't boot, what brought the package into a non-releasable state in the maintainers' opinion. The debdiff against the version currently in testing is attached. unblock vmdebootstrap/0.5-2 -- System Information: Debian Release: 8.0 APT prefers buildd-unstable APT policy: (500, 'buildd-unstable'), (500, 'unstable'), (500, 'testing'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores) Locale: LANG=pt_BR.UTF-8, LC_CTYPE=pt_BR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Antonio Terceiro <terce...@debian.org>
diff -Nru vmdebootstrap-0.5/debian/changelog vmdebootstrap-0.5/debian/changelog --- vmdebootstrap-0.5/debian/changelog 2014-11-16 13:27:52.000000000 -0200 +++ vmdebootstrap-0.5/debian/changelog 2015-02-02 18:38:32.000000000 -0200 @@ -1,3 +1,13 @@ +vmdebootstrap (0.5-2) unstable; urgency=medium + + * Backport patches from upstream master branch to fix creation of images + larger than 1GB that use extlinux (the default). Closes: #774588 + . In debian/patches/: + - 0001-fix-creation-of-extlinux-configuration.patch + - 0002-add-mbr-back-to-support-extlinux-and-check-for-insta.patch + + -- Antonio Terceiro <terce...@debian.org> Mon, 02 Feb 2015 18:38:22 -0200 + vmdebootstrap (0.5-1) unstable; urgency=medium * New upstream bug fix release for Jessie. diff -Nru vmdebootstrap-0.5/debian/patches/0001-fix-creation-of-extlinux-configuration.patch vmdebootstrap-0.5/debian/patches/0001-fix-creation-of-extlinux-configuration.patch --- vmdebootstrap-0.5/debian/patches/0001-fix-creation-of-extlinux-configuration.patch 1969-12-31 21:00:00.000000000 -0300 +++ vmdebootstrap-0.5/debian/patches/0001-fix-creation-of-extlinux-configuration.patch 2015-02-02 18:38:32.000000000 -0200 @@ -0,0 +1,52 @@ +From 3a77e8b1178fcf49dd290659320dc736a1dfceef Mon Sep 17 00:00:00 2001 +From: Neil Williams <codeh...@debian.org> +Date: Mon, 2 Feb 2015 16:38:50 -0200 +Subject: [PATCH 1/2] fix creation of extlinux configuration + +This change is a backport of 545b3e5065fa1f57540cb01255d911d3c5ef2f96 + +Signed-off-by: Antonio Terceiro <terce...@debian.org> +--- + vmdebootstrap | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +diff --git a/vmdebootstrap b/vmdebootstrap +index 24e38d0..74627e2 100755 +--- a/vmdebootstrap ++++ b/vmdebootstrap +@@ -521,8 +521,9 @@ class VmDebootstrap(cliapp.Application): + + conf = os.path.join(rootdir, 'extlinux.conf') + logging.debug('configure extlinux %s' % conf) +- f = open(conf, 'w') +- f.write(''' ++ kserial = 'console=ttyS0,115200' if self.settings['serial-console'] else '' ++ extserial = 'serial 0 115200' if self.settings['serial-console'] else '' ++ msg = ''' + default linux + timeout 1 + +@@ -534,10 +535,16 @@ append initrd=%(initrd)s root=UUID=%(uuid)s ro %(kserial)s + 'kernel': kernel_image, + 'initrd': initrd_image, + 'uuid': uuid, +- 'kserial': +- 'console=ttyS0,115200' if self.settings['serial-console'] else '', +- 'extserial': 'serial 0 115200' if self.settings['serial-console'] else '', +- }) ++ 'kserial': kserial, ++ 'extserial': extserial, ++ } ++ logging.debug("extlinux config:\n%s", msg) ++ ++ # python multiline string substitution is just ugly. ++ # use an external file or live with the mangling, no point in ++ # mangling the string to remove spaces just to keep it pretty in source. ++ f = open(conf, 'w') ++ f.write(msg) + f.close() + + self.runcmd(['extlinux', '--install', rootdir]) +-- +2.1.4 + diff -Nru vmdebootstrap-0.5/debian/patches/0002-add-mbr-back-to-support-extlinux-and-check-for-insta.patch vmdebootstrap-0.5/debian/patches/0002-add-mbr-back-to-support-extlinux-and-check-for-insta.patch --- vmdebootstrap-0.5/debian/patches/0002-add-mbr-back-to-support-extlinux-and-check-for-insta.patch 1969-12-31 21:00:00.000000000 -0300 +++ vmdebootstrap-0.5/debian/patches/0002-add-mbr-back-to-support-extlinux-and-check-for-insta.patch 2015-02-02 18:38:32.000000000 -0200 @@ -0,0 +1,48 @@ +From 087a1e23eb451d8fc33bd04b1e417b56f0d71692 Mon Sep 17 00:00:00 2001 +From: Neil Williams <codeh...@debian.org> +Date: Mon, 2 Feb 2015 16:50:09 -0200 +Subject: [PATCH 2/2] add mbr back to support extlinux and check for + installation of mbr. + +Signed-off-by: Antonio Terceiro <terce...@debian.org> +--- + vmdebootstrap | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/vmdebootstrap b/vmdebootstrap +index 74627e2..67caa84 100755 +--- a/vmdebootstrap ++++ b/vmdebootstrap +@@ -108,7 +108,7 @@ class VmDebootstrap(cliapp.Application): + 'Create an apt source based on the distribution ' + 'and mirror selected.') + self.settings.boolean(['mbr'], +- 'Run install-mbr (no longer done by default)') ++ 'Run install-mbr (default if extlinux used)') + self.settings.boolean(['grub'], + 'Install and configure grub2 - disables ' + 'extlinux.') +@@ -136,7 +136,7 @@ class VmDebootstrap(cliapp.Application): + if self.settings['image']: + self.create_empty_image() + self.partition_image() +- if self.settings['mbr']: ++ if self.settings['mbr'] or self.settings['extlinux']: + self.install_mbr() + (rootdev, bootdev) = self.setup_kpartx() + self.mkfs(rootdev, type=roottype) +@@ -263,6 +263,11 @@ class VmDebootstrap(cliapp.Application): + if os.path.exists("/sbin/install-mbr"): + self.message('Installing MBR') + self.runcmd(['install-mbr', self.settings['image']]) ++ else: ++ msg = "mbr enabled but /sbin/install-mbr not found" ++ " - please install the mbr package." ++ raise cliapp.AppException(msg) ++ + + def setup_kpartx(self): + out = self.runcmd(['kpartx', '-avs', self.settings['image']]) +-- +2.1.4 + diff -Nru vmdebootstrap-0.5/debian/patches/series vmdebootstrap-0.5/debian/patches/series --- vmdebootstrap-0.5/debian/patches/series 1969-12-31 21:00:00.000000000 -0300 +++ vmdebootstrap-0.5/debian/patches/series 2015-02-02 18:38:32.000000000 -0200 @@ -0,0 +1,2 @@ +0001-fix-creation-of-extlinux-configuration.patch +0002-add-mbr-back-to-support-extlinux-and-check-for-insta.patch
signature.asc
Description: Digital signature