diff options
| author | maximilian attems <maks@debian.org> | 2010-07-09 14:26:54 +0200 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2010-07-09 14:26:54 +0200 |
| commit | b2e690b320063af6d11887bfed4119938e85aa51 (patch) | |
| tree | c009602260981941761b0721c6e114e5cb53d0ab | |
| parent | 7af6ef47abf2d617fb15ca90966c8020067d4990 (diff) | |
| parent | ff6116f97b557fd337993a8cc87403021e581325 (diff) | |
| download | initramfs-tools-b2e690b320063af6d11887bfed4119938e85aa51.tar.gz initramfs-tools-b2e690b320063af6d11887bfed4119938e85aa51.zip | |
Merge branch 'maks/hooks'
| -rwxr-xr-x | kernel/postinst.d/initramfs-tools | 4 | ||||
| -rwxr-xr-x | kernel/postrm.d/initramfs-tools | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/kernel/postinst.d/initramfs-tools b/kernel/postinst.d/initramfs-tools index 68124f7..d4db23d 100755 --- a/kernel/postinst.d/initramfs-tools +++ b/kernel/postinst.d/initramfs-tools @@ -9,6 +9,8 @@ bootopt="" # kernel-package passes an extra arg if [ -n "$2" ]; then if [ -n "${KERNEL_PACKAGE_VERSION}" ]; then + # exit if custom kernel does not need an initramfs + [ "$INITRD" = 'No' ] && exit 0 bootdir=$(dirname "$2") bootopt="-b ${bootdir}" else @@ -26,4 +28,4 @@ if [ -n "$DEB_MAINT_PARAMS" ]; then fi # we're good - create initramfs. update runs do_bootloader -update-initramfs -c -t -k "${version}" ${bootopt} +update-initramfs -c -t -k "${version}" ${bootopt} >&2 diff --git a/kernel/postrm.d/initramfs-tools b/kernel/postrm.d/initramfs-tools index 7811589..4e8f73b 100755 --- a/kernel/postrm.d/initramfs-tools +++ b/kernel/postrm.d/initramfs-tools @@ -26,4 +26,4 @@ if [ -n "$DEB_MAINT_PARAMS" ]; then fi # delete initramfs -update-initramfs -d -t -k "${version}" ${bootopt} +update-initramfs -d -t -k "${version}" ${bootopt} >&2 |