diff --git a/debian/changelog b/debian/changelog index 0ec7bd59..3395c933 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.790) UNRELEASED; urgency=medium + + * riscv: reduce the size of the intird for Nezha and LicheeRV + * fix invalid redirects + + -- Heinrich Schuchardt Thu, 13 Oct 2022 15:38:01 +0200 + livecd-rootfs (2.789) kinetic; urgency=medium * re-enable snap preseed (LP: #1991011) diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 3a38300d..469992ba 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -242,7 +242,7 @@ install_grub() { # Per-device images case "${SUBARCH}" in "icicle") - echo "Installing GRUB for ${SUBARCH} board" &1>2 + echo "Installing GRUB for ${SUBARCH} board" # flash-kernel is needed to install the dtb for update-grub: it uses the # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot, # the model value is wrong and we need to use /etc/flash-kernel/machine instead. @@ -271,7 +271,12 @@ install_grub() { chroot mountpoint rm -f /boot/boot.scr ;; "nezha"|"licheerv") - echo "Installing U-Boot for ${SUBARCH} board" &1>2 + local my_d=$(dirname $(readlink -f ${0})) + echo "Reducing initramfs size for ${SUBARCH} board" + mkdir -p mountpoint/etc/initramfs-tools/conf.d/ + cp ${my_d}/initramfs-tools/modules_list.conf mountpoint/etc/initramfs-tools/conf.d/ + chroot mountpoint update-initramfs -c -v -k all + echo "Installing U-Boot for ${SUBARCH} board" # flash-kernel is needed to install the dtb for update-grub: it uses the # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot, # the model value is wrong and we need to use /etc/flash-kernel/machine instead. @@ -316,7 +321,7 @@ install_grub() { chroot mountpoint rm -f /boot/boot.scr ;; "visionfive") - echo "Installing GRUB for VisionFive board" &1>2 + echo "Installing GRUB for VisionFive board" # flash-kernel is needed to install the dtb for update-grub: it uses the # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot, # the model value is wrong and we need to use /etc/flash-kernel/machine instead. diff --git a/live-build/ubuntu-cpc/hooks.d/base/initramfs-tools/modules_list.conf b/live-build/ubuntu-cpc/hooks.d/base/initramfs-tools/modules_list.conf new file mode 100644 index 00000000..99cb474f --- /dev/null +++ b/live-build/ubuntu-cpc/hooks.d/base/initramfs-tools/modules_list.conf @@ -0,0 +1,6 @@ +# The Nezha and the LicheeRV boards do not have enough memory for an initrd with +# most modules. Therefore the number of included modules has to be reduced. +# +# If further modules are needed, add them to /etc/initramfs-tools/modules. + +MODULES=list