From a088e9278296dd3cea8b1ea913028d780b135e63 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 6 Dec 2017 14:22:43 -0800 Subject: [PATCH] Import patches-unapplied version 2.486 to ubuntu/bionic-proposed Imported using git-ubuntu import. Changelog parent: faa28a6472b275d8ff58cf03d8efbaad3707c07b New changelog entries: [ Michael Hudson-Doyle ] * Install grub-ieee1275 instead of grub2 on ppc64el; grub2 is a dummy transitional package in universe. --- debian/changelog | 8 ++++++++ live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ce30ba43..ef6db349 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.486) bionic; urgency=medium + + [ Michael Hudson-Doyle ] + * Install grub-ieee1275 instead of grub2 on ppc64el; grub2 is a dummy + transitional package in universe. + + -- Steve Langasek Wed, 06 Dec 2017 14:22:43 -0800 + livecd-rootfs (2.485) bionic; urgency=medium [ Michael Hudson-Doyle ] diff --git a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary b/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary index b97ef55b..77f24e7e 100755 --- a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary +++ b/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary @@ -31,7 +31,7 @@ install_grub() { mount_partition "${rootfs_dev_mapper}" mountpoint chroot mountpoint apt-get -qqy update - chroot mountpoint apt-get -qqy install grub2 + chroot mountpoint apt-get -qqy install grub-ieee1275 chroot mountpoint apt-get -qqy remove --purge grub-legacy-ec2 # set the kernel commandline to use hvc0