mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-08-08 07:14:08 +00:00
Make stripping of vmlinuz from livefs optional for uImage subarches where
we can't use this trick to save space and disable it on armel+dove.
This commit is contained in:
parent
d7c5ba828e
commit
112012250d
5
debian/changelog
vendored
5
debian/changelog
vendored
@ -1,7 +1,12 @@
|
|||||||
livecd-rootfs (0.97) UNRELEASED; urgency=low
|
livecd-rootfs (0.97) UNRELEASED; urgency=low
|
||||||
|
|
||||||
|
[ Colin Watson ]
|
||||||
* Upgrade to debhelper v7.
|
* Upgrade to debhelper v7.
|
||||||
|
|
||||||
|
[ Loïc Minier ]
|
||||||
|
* Make stripping of vmlinuz from livefs optional for uImage subarches where
|
||||||
|
we can't use this trick to save space and disable it on armel+dove.
|
||||||
|
|
||||||
-- Colin Watson <cjwatson@ubuntu.com> Tue, 15 Sep 2009 13:16:34 +0100
|
-- Colin Watson <cjwatson@ubuntu.com> Tue, 15 Sep 2009 13:16:34 +0100
|
||||||
|
|
||||||
livecd-rootfs (0.96) karmic; urgency=low
|
livecd-rootfs (0.96) karmic; urgency=low
|
||||||
|
19
livecd.sh
19
livecd.sh
@ -346,6 +346,16 @@ link_in_boot = $link_in_boot
|
|||||||
*) echo "Unknown architecture: no kernel."; exit 1;;
|
*) echo "Unknown architecture: no kernel."; exit 1;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# this indicates whether or not to keep /boot/vmlinuz; the default is to
|
||||||
|
# strip it from the livefs as ubiquity >= 1.9.4 copies the kernel from the
|
||||||
|
# CD root (/casper/vmlinuz) to the target if it doesn't find one on the
|
||||||
|
# livefs, allowing us to save space; however some subarches use the uImage
|
||||||
|
# format and wouldn't save any space so the stripping doesn't make sense
|
||||||
|
STRIP_VMLINUZ=yes
|
||||||
|
if [ "$TARGETARCH" = "armel" ] && [ "$SUBARCH" = "dove" ]; then
|
||||||
|
STRIP_VMLINUZ=no
|
||||||
|
fi
|
||||||
|
|
||||||
for x in $EXCLUDE; do
|
for x in $EXCLUDE; do
|
||||||
LIST="$(without_package "$x" "$LIST")"
|
LIST="$(without_package "$x" "$LIST")"
|
||||||
done
|
done
|
||||||
@ -509,9 +519,12 @@ ${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse
|
|||||||
# we mv the initramfs, so it's not wasting space on the livefs
|
# we mv the initramfs, so it's not wasting space on the livefs
|
||||||
mv ${ROOT}/boot/initrd.img-"${KVER}" livecd.${FSS}.initrd-"${SUBARCH}"
|
mv ${ROOT}/boot/initrd.img-"${KVER}" livecd.${FSS}.initrd-"${SUBARCH}"
|
||||||
rm -f ${ROOT}/boot/initrd.img-"${KVER}".bak
|
rm -f ${ROOT}/boot/initrd.img-"${KVER}".bak
|
||||||
# ubiquity >= 1.9.4 copies the kernel from the CD root if it doesn't
|
# whether to strip vmlinuz or not to save space thanks to ubiquity
|
||||||
# find one on the livefs, allowing us to save space
|
action="cp"
|
||||||
mv ${ROOT}/boot/vmlinu?-"${KVER}" livecd.${FSS}.kernel-"${SUBARCH}"
|
if [ "$STRIP_VMLINUZ" = "yes" ]; then
|
||||||
|
action="mv"
|
||||||
|
fi
|
||||||
|
$action ${ROOT}/boot/vmlinu?-"${KVER}" livecd.${FSS}.kernel-"${SUBARCH}"
|
||||||
if [ "$INITRD_COMPRESSOR" != gz ]; then
|
if [ "$INITRD_COMPRESSOR" != gz ]; then
|
||||||
zcat "livecd.${FSS}.initrd-${SUBARCH}" | "$INITRD_COMPRESSOR" -9c \
|
zcat "livecd.${FSS}.initrd-${SUBARCH}" | "$INITRD_COMPRESSOR" -9c \
|
||||||
> "livecd.${FSS}.initrd-${SUBARCH}.new"
|
> "livecd.${FSS}.initrd-${SUBARCH}.new"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user