summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--changelog7
-rw-r--r--src.etc/rc.common4
2 files changed, 9 insertions, 2 deletions
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}