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

Merge branch 'fix-grub-images' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master

Browse Source
This commit is contained in:
Dimitri John Ledkov 2021-04-30 17:39:45 +01:00
commit 143e72abdc
No known key found for this signature in database
GPG Key ID: 9B8EC849D5EF70ED
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
View File

@ -117,7 +117,7 @@ fi
case $arch in case $arch in
# ARM, ppc, riscv64 and s390x images are special # ARM, ppc, riscv64 and s390x images are special
armhf|arm64|powerpc|ppc64el|s390x|riscv64) powerpc|ppc64el|s390x|riscv64)
exit 0 exit 0
;; ;;
esac esac
@ -208,17 +208,20 @@ GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0"
# Set the grub console type # Set the grub console type
GRUB_TERMINAL=console GRUB_TERMINAL=console
EOF EOF
_xchroot "${rootd}" update-grub2
# since this is a disk image, we technically don't need to install all the # Sometimes grub is not installed yet (i.e. uefi arm images). Overall
# grub modules, as the image itself is not bootable. This makes for a small # it is odd that we run this out of chroot hooks, instead of binary
# disk image # hooks. I wonder if we can move all of this to disk-image hooks.
if [ -x "${rootd}/usr/sbin/update-grub" ]; then
_xchroot "${rootd}" update-grub _xchroot "${rootd}" update-grub
fi
# reconfigure grub so that upgrades to grub-pc do not force a debconf config # reconfigure grub so that upgrades to grub-pc do not force a debconf config
# changed prompt (LP: #1009294). This re-runs update-grub # changed prompt (LP: #1009294). This re-runs update-grub
if [ -n "`_xchroot "${rootd}" dpkg-query -W grub-pc 2>/dev/null`" ]; then
_xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \ _xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \
dpkg-reconfigure grub-pc dpkg-reconfigure grub-pc
fi
grub2cfg="${rootd}/boot/grub/grub.cfg" grub2cfg="${rootd}/boot/grub/grub.cfg"
[ ! -f "${grub2cfg}" ] || [ ! -f "${grub2cfg}" ] ||