Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-07 08:51:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.528 to ubuntu/cosmic-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: a24eb25b005afccb8603c235a1b68d19736c03c0

New changelog entries:
  * 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.
This commit is contained in:
Mathieu Trudel-Lapierre 2018-05-28 10:39:09 -04:00 committed by usd-importer
parent a24eb25b00
commit a24105792f
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.528) cosmic; 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:39:09 -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

11
live-build/functions
View File

@ -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