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

Fix rootfs resize and a grub2 font warning.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2021-10-29 15:34:53 +02:00
parent 81407a4aa8
commit 4131dad0da
3 changed files with 18 additions and 0 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.664.33) UNRELEASED; urgency=medium
* Install cloud-initramfs-growroot to actually enable rootfs resize.
* Fix a grub error by making sure the unicode.pf2 font is installed in the
right path for preinstalled amd64 desktop images.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Fri, 29 Oct 2021 15:33:34 +0200
livecd-rootfs (2.664.32) focal; urgency=medium livecd-rootfs (2.664.32) focal; urgency=medium
* 099-ubuntu-image-customization.chroot: fix a typo in it. * 099-ubuntu-image-customization.chroot: fix a typo in it.

3
live-build/auto/config
View File

@ -601,6 +601,9 @@ case $PROJECT in
desktop-preinstalled) desktop-preinstalled)
add_task install minimal standard ubuntu-desktop add_task install minimal standard ubuntu-desktop
if [ "$SUBARCH" = "intel-iot" ]; then if [ "$SUBARCH" = "intel-iot" ]; then
# Since for non-pi we don't have any seeds yet but we want to be able to
# grow the rootfs, manually install cloud-initramfs-growroot during build
add_package install cloud-initramfs-growroot
KERNEL_FLAVOURS='image-intel' KERNEL_FLAVOURS='image-intel'
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
OPTS="${OPTS:+$OPTS }--initramfs=none" OPTS="${OPTS:+$OPTS }--initramfs=none"

7
live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot
View File

@ -105,6 +105,13 @@ PSUEDO_GRUB_PROBE
# Generate grub.cfg # Generate grub.cfg
/usr/sbin/update-grub2 /usr/sbin/update-grub2
# Somehow grub doesn't copy unicode.pf2 to the right fonts
# directory.
if [ ! -e "/boot/grub/fonts/unicode.pf2" ]; then
mkdir -p /boot/grub/fonts
ln /boot/grub/unicode.pf2 /boot/grub/fonts/unicode.pf2
fi
grub2cfg="/boot/grub/grub.cfg" grub2cfg="/boot/grub/grub.cfg"
[ ! -f "${grub2cfg}" ] || [ ! -f "${grub2cfg}" ] ||
sed -i -e "s,root=/dev/[hs]da1,root=LABEL=writable," "${grub2cfg}" sed -i -e "s,root=/dev/[hs]da1,root=LABEL=writable," "${grub2cfg}"