diff options
| author | Ben Hutchings <benh@debian.org> | 2020-09-01 00:36:46 +0100 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2020-09-01 00:36:46 +0100 |
| commit | 181a35c05aef9c7a922dc7a50de2c60c866e4c23 (patch) | |
| tree | 6632d7937bd8ede8c8090ad17a1035e0ce9d9b63 | |
| parent | 3c2d2a718dd44c1826842baf7f1513ee379b5740 (diff) | |
update-initramfs: Remove test for direct invocation from kernel package
The direct invocation of update-initramfs in kernel package maintainer
scripts was removed in:
- Debian linux 2.6.39-1, thus in wheezy
- Ubuntu linux 4.15.0-18.19 (I think), thus in bionic
- kernel-package 12.001, thus in Debian squeeze and Ubuntu lucid
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rwxr-xr-x | kernel/postinst.d/initramfs-tools | 2 | ||||
| -rwxr-xr-x | kernel/postrm.d/initramfs-tools | 2 | ||||
| -rwxr-xr-x | update-initramfs | 22 |
3 files changed, 6 insertions, 20 deletions
diff --git a/kernel/postinst.d/initramfs-tools b/kernel/postinst.d/initramfs-tools index 5d02e57..6b6fef3 100755 --- a/kernel/postinst.d/initramfs-tools +++ b/kernel/postinst.d/initramfs-tools @@ -33,4 +33,4 @@ fi # we're good - create initramfs. update runs do_bootloader # shellcheck disable=SC2086 -INITRAMFS_TOOLS_KERNEL_HOOK=1 update-initramfs -c -k "${version}" ${bootopt} >&2 +update-initramfs -c -k "${version}" ${bootopt} >&2 diff --git a/kernel/postrm.d/initramfs-tools b/kernel/postrm.d/initramfs-tools index 471da86..c340beb 100755 --- a/kernel/postrm.d/initramfs-tools +++ b/kernel/postrm.d/initramfs-tools @@ -33,4 +33,4 @@ fi # delete initramfs # shellcheck disable=SC2086 -INITRAMFS_TOOLS_KERNEL_HOOK=1 update-initramfs -d -k "${version}" ${bootopt} >&2 +update-initramfs -d -k "${version}" ${bootopt} >&2 diff --git a/update-initramfs b/update-initramfs index 063d865..9d25c38 100755 --- a/update-initramfs +++ b/update-initramfs @@ -12,26 +12,12 @@ set -e [ -r ${CONF} ] && . ${CONF} -case "$DPKG_MAINTSCRIPT_PACKAGE" in -linux-image-*) - if [ -z "$INITRAMFS_TOOLS_KERNEL_HOOK" ]; then - # kernel maintainer script called us directly; ignore - # it and let the hook script handle it instead - echo "update-initramfs: deferring update (hook will be called later)" +if [ -n "$DPKG_MAINTSCRIPT_PACKAGE" ] && [ $# = 1 ] && [ x"$1" = x-u ]; then + if dpkg-trigger --no-await update-initramfs; then + echo "update-initramfs: deferring update (trigger activated)" exit 0 fi - ;; -?*) - if [ $# = 1 ] \ - && [ x"$1" = x-u ] - then - if dpkg-trigger --no-await update-initramfs; then - echo "update-initramfs: deferring update (trigger activated)" - exit 0 - fi - fi - ;; -esac +fi usage() { |