[linux-signed] 01/06: Update maintainer script templates to match src:linux

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux-signed.

commit e752d2e485f3d9e4d7c5337d2c171fe10508ee60
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Jun 7 16:25:52 2016 +0100

    Update maintainer script templates to match src:linux
    
    Apply the changes made in:
    
    3df161c94fd5 linux-image: Use linux-check-removal command in prerm; remove debconf templates
---
 debian/templates/image-signed.postinst.in |  4 ----
 debian/templates/image-signed.prerm.in    | 29 +----------------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/debian/templates/image-signed.postinst.in b/debian/templates/image-signed.postinst.in
index ebd17df..25e7dd6 100755
--- a/debian/templates/image-signed.postinst.in
+++ b/debian/templates/image-signed.postinst.in
@@ -7,10 +7,6 @@ if [ "$1" != configure ]; then
     exit 0
 fi
 
-# Workaround for bug #817083 - ensure debconf template is loaded now
-# so we can use it in prerm script.
-. /usr/share/debconf/confmodule
-
 depmod $version
 
 if [ -f /lib/modules/$version/.fresh-install ]; then
diff --git a/debian/templates/image-signed.prerm.in b/debian/templates/image-signed.prerm.in
index 90aa640..f1bde29 100755
--- a/debian/templates/image-signed.prerm.in
+++ b/debian/templates/image-signed.prerm.in
@@ -2,39 +2,12 @@
 
 version=@abiname@@localversion@
 image_path=/boot/@image-stem at -$version
-package_name=linux-image-$version-signed
 
 if [ "$1" != remove ]; then
     exit 0
 fi
 
-. /usr/share/debconf/confmodule
-
-# Are we in a container?  Check for $container in pid 1's environment.
-in_container() {
-    grep -qz '^container=' /proc/1/environ
-}
-
-# Check to see if we are trying to remove a running kernel.
-if ! in_container && ! ischroot && [ "$(uname -r)" = $version ]; then
-    # If we can ask debconf questions, ask whether that's intended
-    # and abort if not.
-    if [ "$DEBIAN_FRONTEND" = noninteractive ]; then
-	echo >&2 "W: removing running kernel image."
-    else
-	question=${package_name}/prerm/removing-running-kernel-$version
-	db_fset $question seen false
-	db_subst $question running $version
-	db_input critical $question
-	db_go
-	db_get $question
-	if [ $RET = true ]; then
-	    echo >&2 "Aborting removal of running kernel image."
-	    exit 1
-	fi
-	echo >&2 "Ok, proceeding with removing running kernel image."
-    fi
-fi
+linux-check-removal $version
 
 if [ -d /etc/kernel/prerm.d ]; then
     DEB_MAINT_PARAMS="$*" run-parts --report --exit-on-error --arg=$version \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-signed.git