elilo, lilo, and zipl all install post-update hooks for us, so we don't need call them specifically. Unfortunately, flash-kernel does not yet, so keep that for a little longer.
Add 'breaks' relations to the versions of these packages that do not install post-update hooks. Signed-off-by: Ben Hutchings <[email protected]> --- debian/control | 2 +- update-initramfs | 37 +------------------------------------ 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/debian/control b/debian/control index f4b9ebf..bc7371b 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Depends: klibc-utils (>= 1.5.9-1), cpio, module-init-tools, udev (>= 0.086-1), f Suggests: bash-completion Provides: linux-initramfs-tool Conflicts: usplash (<< 0.5.50) -Breaks: cryptsetup (<< 2:1.1.0-2.1) +Breaks: cryptsetup (<< 2:1.1.0-2.1), elilo (<< 3.12-3.1~), lilo (<< 22.8-8.2~), s390-tools (<< 1.8.3-2~) Description: tools for generating an initramfs This package contains tools to create and boot an initramfs for packaged 2.6 Linux kernel. The initramfs is a gzipped cpio archive. At boot time, the diff --git a/update-initramfs b/update-initramfs index 96bcb1f..c00656b 100755 --- a/update-initramfs +++ b/update-initramfs @@ -3,7 +3,6 @@ STATEDIR=/var/lib/initramfs-tools BOOTDIR=/boot CONF=/etc/initramfs-tools/update-initramfs.conf -KPKGCONF=/etc/kernel-img.conf USETRIGGERS=true mode="" version="" @@ -204,41 +203,7 @@ run_bootloader() return 0 fi - # FIXME: to be removed postsqueeze release - # if both lilo and grub around, figure out if lilo needs to be run - if ( command -v update-grub >/dev/null 2>&1 \ - || [ -e /boot/grub/menu.lst ] || [ -e /boot/grub/grub.cfg ] ) \ - && ( [ -e /etc/lilo.conf ] && command -v lilo >/dev/null 2>&1 ); then - [ -r "${KPKGCONF}" ] && \ - do_b=$(awk '/^do_bootloader/{print $3}' "${KPKGCONF}") - if [ "${do_b}" = "yes" ] || [ "${do_b}" = "Yes" ] \ - || [ "${do_b}" = "YES" ]; then - run_lilo - return 0 - elif [ "${do_b}" = "no" ] || [ "${do_b}" = "No" ] \ - || [ "${do_b}" = "NO" ]; then - return 0 - fi - - # do_bootloader unconfigured - echo - echo "WARNING: grub and lilo installed." - echo "Please deinstall unused bootloader." - echo - return 0 - fi - if [ -r /etc/lilo.conf ] && command -v lilo >/dev/null 2>&1; then - run_lilo - return 0 - fi - if [ -r /etc/elilo.conf ] && command -v elilo >/dev/null 2>&1; then - elilo - return 0 - fi - if [ -r /etc/zipl.conf ]; then - zipl - return 0 - fi + # FIXME: to be removed once flash-kernel installs a hook if flash-kernel --supported >/dev/null 2>&1; then flash-kernel ${version} return 0 -- 1.7.4.1
signature.asc
Description: This is a digitally signed message part
