diff --git a/debian/changelog b/debian/changelog index 9ac41a15..d3e6e93a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ livecd-rootfs (0.62) UNRELEASED; urgency=low * Use 'set -eu' rather than putting -eu on the #! line, so that running 'sh -x /usr/sbin/livecd.sh' for testing doesn't invoke different error-handling behaviour. + * Remove the kernel from the livefs; ubiquity >= 1.9.4 will copy it from + the CD root if it needs to (LP: #80385). -- Colin Watson Tue, 08 Jul 2008 10:14:50 +0100 diff --git a/livecd.sh b/livecd.sh index 30782541..4a99800c 100755 --- a/livecd.sh +++ b/livecd.sh @@ -431,7 +431,9 @@ deb-src ${USERMIRROR} ${STE}-updates ${COMP} # we mv the initramfs, so it's not wasting space on the livefs mv ${ROOT}/boot/initrd.img-"${KVER}" livecd.${FSS}.initrd-"${SUBARCH}" rm -f ${ROOT}/boot/initrd.img-"${KVER}".bak - cp ${ROOT}/boot/vmlinu?-"${KVER}" livecd.${FSS}.kernel-"${SUBARCH}" + # ubiquity >= 1.9.3 copies the kernel from the CD root if it doesn't + # find one on the livefs, allowing us to save space + mv ${ROOT}/boot/vmlinu?-"${KVER}" livecd.${FSS}.kernel-"${SUBARCH}" done NUMKVERS="$(set -- $KVERS; echo $#)" if [ "$NUMKVERS" = 1 ]; then