diffstat for zipl-installer-0.0.35 zipl-installer-0.0.35ubuntu1 changelog | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ control | 3 +- zipl-installer.postinst | 15 ++++++++---- 3 files changed, 73 insertions(+), 5 deletions(-) diff -Nru zipl-installer-0.0.35/debian/changelog zipl-installer-0.0.35ubuntu1/debian/changelog --- zipl-installer-0.0.35/debian/changelog 2016-10-23 21:25:37.000000000 +0000 +++ zipl-installer-0.0.35ubuntu1/debian/changelog 2017-01-19 13:58:41.000000000 +0000 @@ -1,3 +1,13 @@ +zipl-installer (0.0.35ubuntu1) zesty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Install s390-tools & sysconfig-hardware in target, such that they + are available even if they move out of ubuntu-minimal into standard. + - Enable crashkernel=196M paramemter for d-i installs by default. + - Apply ubuntu branding. + + -- Dimitri John Ledkov Thu, 19 Jan 2017 13:58:34 +0000 + zipl-installer (0.0.35) unstable; urgency=medium * Copy Ubuntu's fix-up for the btrfs subvolume check from 0.0.33ubuntu2. @@ -12,6 +22,35 @@ -- Christian Perrier Sun, 18 Sep 2016 18:45:39 +0200 +zipl-installer (0.0.33ubuntu4) xenial; urgency=medium + + * Install s390-tools & sysconfig-hardware in target, such that they are + available even if they move out of ubuntu-minimal into standard. + + -- Dimitri John Ledkov Wed, 13 Apr 2016 11:53:35 +0100 + +zipl-installer (0.0.33ubuntu3) xenial; urgency=medium + + * Reluctantly Bump crashkernel to 196M, as otherwise 128M is not enough + by default to collect a kdump on any LPAR, defeating the intended + purpose in the first place. (LP: #1564475) + + -- Dimitri John Ledkov Mon, 11 Apr 2016 12:49:46 +0100 + +zipl-installer (0.0.33ubuntu2) xenial; urgency=medium + + * Test for missing/empty btrfs volume label harder. LP: #1566387. + + -- Dimitri John Ledkov Tue, 05 Apr 2016 16:53:03 +0100 + +zipl-installer (0.0.33ubuntu1) xenial; urgency=medium + + * Merge from Debian, remaining changes: + - Enable crashkernel=128M paramemter for d-i installs by default. + - Apply ubuntu branding. + + -- Dimitri John Ledkov Fri, 01 Apr 2016 15:48:03 +0100 + zipl-installer (0.0.33) unstable; urgency=medium * Query /target's btrfs subvolume and correctly add rootfs subvol flag @@ -19,6 +58,20 @@ -- Dimitri John Ledkov Fri, 01 Apr 2016 15:45:28 +0100 +zipl-installer (0.0.32ubuntu2) xenial; urgency=medium + + * Enable crashkernel=128M paramemter for d-i installs by default. LP: + #1555159 + + -- Dimitri John Ledkov Fri, 18 Mar 2016 17:45:45 +0000 + +zipl-installer (0.0.32ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Apply ubuntu branding. + + -- Dimitri John Ledkov Mon, 29 Feb 2016 08:36:01 +0000 + zipl-installer (0.0.32) unstable; urgency=medium [ Hendrik Brueckner ] @@ -34,6 +87,12 @@ -- Christian Perrier Thu, 04 Feb 2016 07:00:48 +0100 +zipl-installer (0.0.30ubuntu1) xenial; urgency=high + + * Apply ubuntu branding. + + -- Dimitri John Ledkov Mon, 18 Jan 2016 14:55:01 +0000 + zipl-installer (0.0.30) unstable; urgency=medium * Fix elif/then syntax in postinst script, thanks to Hendrik Brueckner @@ -484,3 +543,4 @@ * First release -- Bastian Blank Thu, 20 May 2004 12:18:59 +0200 + diff -Nru zipl-installer-0.0.35/debian/control zipl-installer-0.0.35ubuntu1/debian/control --- zipl-installer-0.0.35/debian/control 2016-10-04 10:30:44.000000000 +0000 +++ zipl-installer-0.0.35ubuntu1/debian/control 2016-10-24 05:54:59.000000000 +0000 @@ -1,7 +1,8 @@ Source: zipl-installer Section: debian-installer Priority: standard -Maintainer: Debian Install System Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Install System Team Uploaders: Bastian Blank , Philipp Kern , Christian Perrier Build-Depends: debhelper (>= 9) Vcs-Browser: https://anonscm.debian.org/cgit/d-i/zipl-installer.git diff -Nru zipl-installer-0.0.35/debian/zipl-installer.postinst zipl-installer-0.0.35ubuntu1/debian/zipl-installer.postinst --- zipl-installer-0.0.35/debian/zipl-installer.postinst 2016-10-23 20:27:21.000000000 +0000 +++ zipl-installer-0.0.35ubuntu1/debian/zipl-installer.postinst 2016-10-24 05:54:59.000000000 +0000 @@ -14,6 +14,13 @@ mount | grep "on /target${1%/} " | tail -n1 | cut -d' ' -f1 } +# Just in case s390-tools & sysconfig-hardware move from minimal to +# standard +# zipl +apt-install s390-tools || true +# initramfs hooks +apt-install sysconfig-hardware || true + rootfs_devfs="$(findfs /)" rootfs="$(mapdevfs $rootfs_devfs)" log "Root filesystem on ${rootfs} (${rootfs_devfs})" @@ -41,23 +48,23 @@ :menu target = /boot -1 = debian +1 = ubuntu 2 = old default = 1 prompt = 1 timeout = 10 -[debian] +[ubuntu] target = /boot image = /boot/vmlinuz ramdisk = /boot/initrd.img -parameters = $PARAMETER +parameters = $PARAMETER crashkernel=196M [old] target = /boot image = /boot/vmlinuz.old ramdisk = /boot/initrd.img.old -parameters = $PARAMETER +parameters = $PARAMETER crashkernel=196M optional = 1 EOF