[SCM] live-debconfig branch, debian-next, updated. debian/3.0_a1-1-10-g3a07399

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 3a073992b269446727ba628d7fe94d010cc4cf72
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jul 21 18:08:54 2012 +0200

    Making selinux script more robust.

diff --git a/scripts/debconfig/0100-selinux b/scripts/debconfig/0100-selinux
index 8516ea3..680b18c 100755
--- a/scripts/debconfig/0100-selinux
+++ b/scripts/debconfig/0100-selinux
@@ -14,31 +14,31 @@ set -e
 
 Defaults ()
 {
-	if [ -z "${_ENABLE}" ]
+	if [ -z "${_SELINUX_ENABLE}" ]
 	then
 		if [ -n "$(cat /selinux/enforce 2> /dev/null)" ]
 		then
 			case "$(cat /selinux/enforce 2> /dev/null)" in
 				0)
-					_ENABLE="false"
+					_SELINUX_ENABLE="false"
 					;;
 
 				1)
-					_ENABLE="true"
+					_SELINUX_ENABLE="true"
 					;;
 			esac
 		else
-			_ENABLE="false"
+			_SELINUX_ENABLE="false"
 		fi
 	fi
 }
 
-#db_get live-debconfig/selinux/enable
-#_ENABLE="${RET}" # boolean
+db_get live-debconfig/selinux/enable
+_SELINUX_ENABLE="${RET}" # boolean
 
 Defaults
 
-db_set live-debconfig/selinux/enable "${_ENABLE}"
+db_set live-debconfig/selinux/enable "${_SELINUX_ENABLE}"
 db_fset live-debconfig/selinux/enable seen false
 
 db_settitle live-debconfig/title
@@ -46,13 +46,13 @@ db_input high live-debconfig/selinux/enable || true
 db_go
 
 db_get live-debconfig/selinux/enable
-_ENABLE="${RET}" # boolean
+_SELINUX_ENABLE="${RET}" # boolean
 
-#Defaults
+Defaults
 
 db_stop
 
-case "${_ENABLE}" in
+case "${_SELINUX_ENABLE}" in
 	true)
 		rm -f /selinux/enforce
 		rmdir --ignore-fail-on-non-empty /selinux > /dev/null 2>&1 || true

-- 
live-debconfig