[Apparmor-dev] [RFC 4/5] initscript: kill debug option

[Steve Beattie]

The apparmor module no longer supports being loaded with the
subdomain_debug module argument. Kill the option that tried to do this.
---
 parser/rc.apparmor.debian    |    3 ---
 parser/rc.apparmor.functions |    8 --------
 parser/rc.apparmor.redhat    |    3 ---
 parser/rc.apparmor.slackware |    3 ---
 parser/rc.apparmor.suse      |    3 ---
 5 files changed, 20 deletions(-)

Index: b/parser/rc.apparmor.debian
===================================================================
--- a/parser/rc.apparmor.debian
+++ b/parser/rc.apparmor.debian
@@ -100,9 +100,6 @@ case "$1" in
 	try-restart)
 		subdomain_try_restart
 		;;
-	debug)
-		subdomain_debug
-		;;
 	kill)
 		subdomain_kill
 		;;
Index: b/parser/rc.apparmor.functions
===================================================================
--- a/parser/rc.apparmor.functions
+++ b/parser/rc.apparmor.functions
@@ -427,14 +427,6 @@ subdomain_try_restart() {
 	return $?
 }
 
-subdomain_debug() {
-	subdomain_kill
-	load_module "subdomain_debug=1"
-	mount_subdomainfs
-	configure_owlsm
-	parse_profiles load
-}
-
 configure_owlsm () {
 	if [ "${SUBDOMAIN_ENABLE_OWLSM}" = "yes" -a -f ${SFS_MOUNTPOINT}/control/owlsm ] ; then
 		# Sigh, the "sh -c" is necessary for the SuSE sd_action
Index: b/parser/rc.apparmor.redhat
===================================================================
--- a/parser/rc.apparmor.redhat
+++ b/parser/rc.apparmor.redhat
@@ -107,9 +107,6 @@ case "$1" in
 	try-restart)
 		subdomain_try_restart
 		;;
-	debug)
-		subdomain_debug
-		;;
 	kill)
 		subdomain_kill
 		;;
Index: b/parser/rc.apparmor.slackware
===================================================================
--- a/parser/rc.apparmor.slackware
+++ b/parser/rc.apparmor.slackware
@@ -81,9 +81,6 @@ case "$1" in
 	try-restart)
 		subdomain_try_restart
 		;;
-	debug)
-		subdomain_debug
-		;;
 	kill)
 		subdomain_kill
 		;;
Index: b/parser/rc.apparmor.suse
===================================================================
--- a/parser/rc.apparmor.suse
+++ b/parser/rc.apparmor.suse
@@ -110,9 +110,6 @@ case "$1" in
 	try-restart)
 		subdomain_try_restart
 		;;
-	debug)
-		subdomain_debug
-		;;
 	kill)
 		subdomain_kill
 		;;

-- 
Steve Beattie
SUSE Labs, Novell Inc. 
<sbeattie at suse.de>
http://NxNW.org/~steve/