[Pkg-iscsi-maintainers] [SCM] Debian iscsitarget packaging branch, master, updated. debian/1.4.20.2-9-3-g1211149

[Ritesh Raj Sarraf]

The following commit has been merged in the master branch:
commit 2bebbc2843c69632acb3fb1c70b0e664b4b13783
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Wed Mar 14 00:36:08 2012 +0530

    don't prompt on modified conffiles
    
    Thanks: Andreas Beckmann
    Closes: #661397

diff --git a/debian/iscsitarget.postinst b/debian/iscsitarget.postinst
index 81c3fbb..051b3d6 100644
--- a/debian/iscsitarget.postinst
+++ b/debian/iscsitarget.postinst
@@ -2,50 +2,12 @@
 
 set -e
 
-case "$1" in
-  configure)
-	if [ -f /etc/ietd.conf ]; then
-		mv -f /etc/ietd.conf /etc/iet/
-		echo "Moving config /etc/ietd.conf to new location /etc/iet/"
-	fi
-
-	if [ -f /etc/initiators.allow ]; then
-		mv -f /etc/initiators.allow /etc/iet/
-		echo "Moving config /etc/initiators.allow to new location /etc/iet/"
-	fi
-
-	if [ -f /etc/initiators.deny ]; then
-		mv -f /etc/initiators.deny /etc/iet/
-		echo "Moving config /etc/initiators.deny to new location /etc/iet/"
-	fi
-
-	# Clean up the mess created in the last upload, 1.4.20.1-2
-	if [ -d /etc/ietd ]; then
-		if [ -f /etc/ietd/ietd.conf ]; then
-			mv -f /etc/ietd/ietd.conf /etc/iet/
-		fi
-		if [ -f /etc/ietd/initiators.allow ]; then
-			mv -f /etc/ietd/initiators.allow /etc/iet/
-		fi
-		if [ -f /etc/ietd/initiators.deny ]; then
-			mv -f /etc/ietd/initiators.deny /etc/iet/
-		fi
-		rm -rf /etc/ietd/
-	fi
-
-	# Clean up old cruft
-	if [ -f /etc/sysctl.d/30-iscsitarget.conf ]; then
-		mv -f /etc/sysctl.d/30-iscsitarget.conf /etc/sysctl.d/30-iscsitarget.conf.bak
-	fi
-  ;;
-  abort-upgrade|abort-remove|abort-deconfigure|triggered)
-  ;;
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1;
-  ;;
-esac
+dpkg-maintscript-helper mv_conffile /etc/ietd.conf /etc/iet/ -- "@"
+dpkg-maintscript-helper mv_conffile /etc/initiators.allow /etc/iet/ -- "@"
+dpkg-maintscript-helper mv_conffile /etc/initiators.deny /etc/iet/ -- "@"
 
+# Clean up old cruft
+dpkg-maintscript-helper rm_conffile /etc/sysctl.d/30-iscsitarget.conf -- "@"
 
 #DEBHELPER#
 

-- 
Debian iscsitarget packaging