Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-24 01:01:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Undivert update-initramfs more carefully

Browse Source 
Previously the wrapper script and diversion were left in place on images
such as buildd images that don't have initramfs-tools installed.

LP: #1841573
This commit is contained in:
Colin Watson 2019-08-27 12:45:57 +01:00
parent ce58687eed
commit 9a65a4013d
4 changed files with 19 additions and 6 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.606) UNRELEASED; urgency=medium
* Undivert update-initramfs more carefully: previously the wrapper script
and diversion were left in place on images such as buildd images that
don't have initramfs-tools installed (LP: #1841573).
-- Colin Watson <cjwatson@ubuntu.com> Tue, 27 Aug 2019 12:43:55 +0100
livecd-rootfs (2.605) eoan; urgency=medium livecd-rootfs (2.605) eoan; urgency=medium
[ David Krauser ] [ David Krauser ]

1
live-build/auto/build
View File

@ -284,6 +284,7 @@ EOF
divert_grub chroot divert_grub chroot
divert_update_initramfs divert_update_initramfs
lb chroot "$@" lb chroot "$@"
undivert_update_initramfs
undivert_grub chroot undivert_grub chroot
fi fi

11
live-build/functions
View File

@ -875,13 +875,12 @@ echo "update-initramfs: diverted by livecd-rootfs (will be called later)" >&2
exit 0 exit 0
EOF EOF
chmod +x chroot/usr/sbin/update-initramfs chmod +x chroot/usr/sbin/update-initramfs
}
cat > config/hooks/999-undivert-update-initramfs.chroot <<'EOF' undivert_update_initramfs () {
#! /bin/sh rm -f chroot/usr/sbin/update-initramfs
[ ! -f /usr/sbin/update-initramfs.REAL ] && exit 0 Chroot chroot "dpkg-divert --quiet --remove --rename \
rm -f /usr/sbin/update-initramfs /usr/sbin/update-initramfs"
dpkg-divert --quiet --remove --rename /usr/sbin/update-initramfs
EOF
} }
is_root_layer () { is_root_layer () {

5
live-build/lb_chroot_layered
View File

@ -261,6 +261,11 @@ create_chroot_pass () {
lb chroot_dpkg remove ${*} lb chroot_dpkg remove ${*}
lb chroot_debianchroot remove ${*} lb chroot_debianchroot remove ${*}
# Restore update-initramfs, if necessary
if $(is_root_layer $pass); then
undivert_update_initramfs
fi
# Restore grub # Restore grub
undivert_grub chroot undivert_grub chroot