base-files: fix backwards compatiblity of rc.common EXTRA_COMMANDS

[openwrt/openwrt.git] / package / base-files / files / etc / rc.common

diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common
index d3d91ef2509192c5c5acaa73ef05b48857bf6534..f39b69464eac98f92012ecc6f1566531049081b6 100755 (executable)
--- a/package/base-files/files/etc/rc.common
+++ b/package/base-files/files/etc/rc.common
@@ -62,15 +62,15 @@ depends() {
        return 0
 }
 
-EXTRA_HELP=""
-EXTRA_COMMANDS="boot shutdown depends"
+ALL_HELP=""
+ALL_COMMANDS="boot shutdown depends"
 extra_command() {
        local cmd="$1"
        local help="$2"
 
        local extra="$(printf "%-16s%s" "${cmd}" "${help}")"
-       EXTRA_HELP="${EXTRA_HELP}\t${extra}\n"
-       EXTRA_COMMANDS="${EXTRA_COMMANDS} ${cmd}"
+       ALL_HELP="${ALL_HELP}\t${extra}\n"
+       ALL_COMMANDS="${ALL_COMMANDS} ${cmd}"
 }
 
 help() {
@@ -79,7 +79,7 @@ Syntax: $initscript [command]
 
 Available commands:
 EOF
-       echo -e "$EXTRA_HELP"
+       echo -e "$ALL_HELP"
 }
 
 # for procd
@@ -175,6 +175,7 @@ extra_command "enabled" "Check if service is started on boot"
        }
 }
 
-ALL_COMMANDS="${EXTRA_COMMANDS}"
+ALL_COMMANDS="${ALL_COMMANDS} ${EXTRA_COMMANDS}"
+ALL_HELP="${ALL_HELP}${EXTRA_HELP}"
 list_contains ALL_COMMANDS "$action" || action=help
 $action "$@"