From fbefb18e5b4b04949a82ba470178c84c4cc97ac5 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Mon, 09 Jun 2014 15:06:33 -0400
Subject: /etc/rc.common: Don't disable *able actions.

---
diff --git a/changelog b/changelog
index 21ce34a..fc55148 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+busybox (1.21.1-6) trunk
+
+  * /etc/rc.common: Disabling service initialization with /etc/rc.policy
+    no longer disables service enablement or disablement.
+
+ -- "P. J. McDermott" <pj@pehjota.net>  Mon, 09 Jun 2014 15:05:56 -0400
+
 busybox (1.21.1-5) trunk
 
   * /etc/rc.common: New framework for service initialization scripts.
diff --git a/src.etc/rc.common b/src.etc/rc.common
index 7ddc27e..50c6020 100644
--- a/src.etc/rc.common
+++ b/src.etc/rc.common
@@ -37,9 +37,9 @@ main()
 	fi
 	action="${2:-<unknown>}"
 	if [ "x${ALL_CMDS#* ${action} }" != "x${ALL_CMDS}" ]; then
-		if [ -f /etc/rc.policy ]; then
+		[ "x${action%able}" = "x${action}" ] && \
+			[ -f /etc/rc.policy ] && \
 			[ "x$(cat /etc/rc.policy)" = 'xdisabled' ] && return 0
-		fi
 		${action}
 		es=${?}
 		log_end ${es}
--
cgit v0.9.1