diff options
| author | P. J. McDermott <pj@pehjota.net> | 2014-06-09 15:06:33 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2014-06-09 15:07:38 (EDT) |
| commit | fbefb18e5b4b04949a82ba470178c84c4cc97ac5 (patch) | |
| tree | 15043a1e474e67fd01eb9f06431215630aa64dc3 | |
| parent | d3b31d2ea46cbdc2edf39341584167a7a4b1be17 (diff) | |
/etc/rc.common: Don't disable *able actions.
| -rw-r--r-- | changelog | 7 | ||||
| -rw-r--r-- | src.etc/rc.common | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -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} |