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

Fix the force-partuuid handling to create the file under

Browse Source 
/etc/default/grub.d/ with a .cfg extension as grub expects; it's unclear
how this ever worked without.
This commit is contained in:
Steve Langasek 2017-10-05 16:02:26 +02:00 committed by Balint Reczey
parent b66cc28507
commit b2fba90356
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -34,6 +34,9 @@ livecd-rootfs (2.408.19) xenial; urgency=medium
bug that should be fixed in tzdata. bug that should be fixed in tzdata.
* Factor out grub-related diversions and use them consistently, so we * Factor out grub-related diversions and use them consistently, so we
don't end up with wrong os-probe output in our grub.cfg. don't end up with wrong os-probe output in our grub.cfg.
* Fix the force-partuuid handling to create the file under
/etc/default/grub.d/ with a .cfg extension as grub expects; it's unclear
how this ever worked without.
[ Balint Reczey ] [ Balint Reczey ]
* Mount using --make-rslave to ensure safe unmounts for rbind mounts * Mount using --make-rslave to ensure safe unmounts for rbind mounts

5
live-build/ubuntu-cpc/functions
View File

@ -274,8 +274,9 @@ replace_grub_root_with_label() {
CHROOT_ROOT="$1" CHROOT_ROOT="$1"
# If boot by partuuid has been requested, don't override. # If boot by partuuid has been requested, don't override.
if [ -f $CHROOT_ROOT/etc/default/grub.d/40-partuuid ] && \ if [ -f $CHROOT_ROOT/etc/default/grub.d/40-force-partuuid.cfg ] && \
grep -q ^GRUB_FORCE_PARTUUID= $CHROOT_ROOT/etc/default/grub.d/40-partuuid; then grep -q ^GRUB_FORCE_PARTUUID= $CHROOT_ROOT/etc/default/grub.d/40-force-partuuid.cfg
then
return 0 return 0
fi fi
sed -i -e "s,root=[^ ]\+,root=LABEL=cloudimg-rootfs," \ sed -i -e "s,root=[^ ]\+,root=LABEL=cloudimg-rootfs," \

2
live-build/ubuntu-cpc/hooks/032-disk-image.binary
View File

@ -119,7 +119,7 @@ if [ "${should_install_grub}" -eq 1 ]; then
if [ "${SUBPROJECT:-}" = minimized ] && [ -n "$partuuid" ]; then if [ "${SUBPROJECT:-}" = minimized ] && [ -n "$partuuid" ]; then
echo "partuuid found for root device; forcing it in Grub" echo "partuuid found for root device; forcing it in Grub"
mkdir -p mountpoint/etc/default/grub.d mkdir -p mountpoint/etc/default/grub.d
echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid.cfg
divert_grub mountpoint divert_grub mountpoint
chroot mountpoint update-grub chroot mountpoint update-grub
undivert_grub mountpoint undivert_grub mountpoint

2
live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
View File

@ -66,7 +66,7 @@ install_grub() {
# and 033-disk-image-uefi.binary. We want to fix this to not # and 033-disk-image-uefi.binary. We want to fix this to not
# have initramfs-tools installed at all on these images. # have initramfs-tools installed at all on these images.
echo "partuuid found for root device; omitting initrd" echo "partuuid found for root device; omitting initrd"
echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid.cfg
fi fi
chroot mountpoint apt-get -y update chroot mountpoint apt-get -y update