remove some of the cargo culted scorpions

ubuntu/cosmic
Michael Hudson-Doyle 7 years ago
parent b163743456
commit 3e69d30c9e

2
debian/changelog vendored

@ -1,4 +1,4 @@
livecd-rootfs (2.505~ppa3) bionic; urgency=medium livecd-rootfs (2.505~ppa4) bionic; urgency=medium
* Move casper from filesystem.squashfs to installer.squashfs. * Move casper from filesystem.squashfs to installer.squashfs.

@ -338,28 +338,11 @@ recreate_initramfs() {
# tweaking... # tweaking...
CHROOT="$1" CHROOT="$1"
# Start by cargo culting bits of lb_chroot_hacks: # Start by cargo culting bits of lb_chroot_hacks:
if [ -n "$LB_INITRAMFS_COMPRESSION" ]; then
echo "COMPRESS=$LB_INITRAMFS_COMPRESSION" > "$CHROOT"/etc/initramfs-tools/conf.d/livecd-rootfs.conf
fi
chroot "$CHROOT" sh -c "${UPDATE_INITRAMFS_OPTIONS:-} update-initramfs -k all -t -u" chroot "$CHROOT" sh -c "${UPDATE_INITRAMFS_OPTIONS:-} update-initramfs -k all -t -u"
case "${LB_INITRAMFS_COMPRESSION}" in rm -rf "$CHROOT"/etc/initramfs-tools/conf.d/livecd-rootfs.conf
gzip)
;;
bzip2)
for INITRAMFS in $(find "$CHROOT"/boot -name 'initrd*' -not -type l); do
zcat "${INITRAMFS}" | bzip2 -c ${BZIP2_OPTIONS} > "${INITRAMFS}.new"
mv "${INITRAMFS}.new" "${INITRAMFS}"
done
;;
lzma)
# We probably ought to use COMPRESS= in a temporary file in
# /etc/initramfs-tools/conf.d/ instead, but it's hard to
# pass options that way.
for INITRAMFS in $(find "$CHROOT"/boot -name 'initrd*' -not -type l); do
zcat "${INITRAMFS}" | lzma -c ${LZMA_OPTIONS} > "${INITRAMFS}.new"
mv "${INITRAMFS}.new" "${INITRAMFS}"
done
;;
esac
# Then bits of lb_binary_linux-image: # Then bits of lb_binary_linux-image:
case "${LB_INITRAMFS}" in case "${LB_INITRAMFS}" in
casper) casper)

Loading…
Cancel
Save