[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH 1/4] kernel hooks: Treat missing version argument as an error



The version argument is mandatory and we should complain if some package
doesn't pass it rather than quietly failing to do our job.

However, making package removal fail is generally unhelpful, so
continue to return 0 from the postrm hook.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 kernel/postinst.d/initramfs-tools |    5 ++++-
 kernel/postrm.d/initramfs-tools   |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kernel/postinst.d/initramfs-tools b/kernel/postinst.d/initramfs-tools
index d4db23d..f312e43 100755
--- a/kernel/postinst.d/initramfs-tools
+++ b/kernel/postinst.d/initramfs-tools
@@ -4,7 +4,10 @@ version="$1"
 bootopt=""
 
 # passing the kernel version is required
-[ -z "${version}" ] && exit 0
+if [ -z "${version}" ]; then
+	echo >&2 "initramfs-tools: ${DPKG_MAINTSCRIPT_PACKAGE:-kernel package} did not pass a version number"
+	exit 2
+fi
 
 # kernel-package passes an extra arg
 if [ -n "$2" ]; then
diff --git a/kernel/postrm.d/initramfs-tools b/kernel/postrm.d/initramfs-tools
index 4e8f73b..051c8de 100755
--- a/kernel/postrm.d/initramfs-tools
+++ b/kernel/postrm.d/initramfs-tools
@@ -4,7 +4,10 @@ version="$1"
 bootopt=""
 
 # passing the kernel version is required
-[ -z "${version}" ] && exit 0
+if [ -z "${version}" ]; then
+	echo >&2 "initramfs-tools: ${DPKG_MAINTSCRIPT_PACKAGE:-kernel package} did not pass a version number"
+	exit 0
+fi
 
 # kernel-package passes an extra arg
 if [ -n "$2" ]; then
-- 
1.7.4.1



Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: