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

Import patches-unapplied version 2.467 to ubuntu/artful-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 7bff7abdf4c17df8edb3c04e774a861ce621be84

New changelog entries:
  * fix remaining wrong references to /etc/default/grub.d/40-partuuid
This commit is contained in:
Steve Langasek 2017-10-04 23:52:21 -07:00 committed by usd-importer
parent 7bff7abdf4
commit b053111651
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.467) artful; urgency=medium
* fix remaining wrong references to /etc/default/grub.d/40-partuuid
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 04 Oct 2017 23:52:21 -0700
livecd-rootfs (2.466) artful; urgency=medium livecd-rootfs (2.466) artful; urgency=medium
* ubuntu-server: drop hard-coded test key from the subiquity overlay in * ubuntu-server: drop hard-coded test key from the subiquity overlay in

5
live-build/functions
View File

@ -276,8 +276,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.cfg; 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=${fs_label}," \ sed -i -e "s,root=[^ ]\+,root=LABEL=${fs_label}," \