Don't divert grub-probe; otherwise we're missing the filesystem UUIDs that

the grub search command needs to find the right prefix/root. This is
different than the PARTUUID for booting initrd-less.
ubuntu/cosmic
Mathieu Trudel-Lapierre 7 years ago
parent 9c4028cc85
commit 056e760c06

8
debian/changelog vendored

@ -1,3 +1,11 @@
livecd-rootfs (2.528) UNRELEASED; urgency=medium
* Don't divert grub-probe; otherwise we're missing the filesystem UUIDs that
the grub search command needs to find the right prefix/root. This is
different than the PARTUUID for booting initrd-less.
-- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Mon, 28 May 2018 10:36:18 -0400
livecd-rootfs (2.527) cosmic; urgency=medium livecd-rootfs (2.527) cosmic; urgency=medium
* Symlink systemd-networkd-wait-online to /bin/true in the live installer * Symlink systemd-networkd-wait-online to /bin/true in the live installer

@ -296,10 +296,9 @@ replace_grub_root_with_label() {
divert_grub() { divert_grub() {
CHROOT_ROOT="$1" CHROOT_ROOT="$1"
chroot "$CHROOT_ROOT" dpkg-divert --local \ # Don't divert all of grub-probe here; just the scripts we don't want
--rename /usr/sbin/grub-probe # running. Otherwise, you may be missing part-uuids for the search
chroot "$CHROOT_ROOT" touch /usr/sbin/grub-probe # command, for example. ~cyphermox
chroot "$CHROOT_ROOT" chmod +x /usr/sbin/grub-probe
chroot "$CHROOT_ROOT" dpkg-divert --local \ chroot "$CHROOT_ROOT" dpkg-divert --local \
--divert /etc/grub.d/30_os-prober.dpkg-divert \ --divert /etc/grub.d/30_os-prober.dpkg-divert \
@ -318,10 +317,6 @@ divert_grub() {
undivert_grub() { undivert_grub() {
CHROOT_ROOT="$1" CHROOT_ROOT="$1"
chroot "$CHROOT_ROOT" rm /usr/sbin/grub-probe
chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
--rename /usr/sbin/grub-probe
chroot "$CHROOT_ROOT" dpkg-divert --remove --local \ chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
--divert /etc/grub.d/30_os-prober.dpkg-divert \ --divert /etc/grub.d/30_os-prober.dpkg-divert \
--rename /etc/grub.d/30_os-prober --rename /etc/grub.d/30_os-prober

Loading…
Cancel
Save