X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/05adaa9794e41d02870a74a1ed7ba58cc59b9286..65f7b3c0ed1b03fae80df82d4a2284c7a3570d8a:/package/base-files/files/etc/rc.common?ds=inline diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common index 7180b0f7f..6b3c213a1 100755 --- a/package/base-files/files/etc/rc.common +++ b/package/base-files/files/etc/rc.common @@ -3,8 +3,6 @@ . $IPKG_INSTROOT/etc/functions.sh -START=50 - start() { return 0 } @@ -18,12 +16,13 @@ reload() { } restart() { - stop - start + trap '' TERM + stop "$@" + start "$@" } boot() { - start + start "$@" } shutdown() { @@ -33,12 +32,19 @@ shutdown() { disable() { name="$(basename "${initscript}")" rm -f "$IPKG_INSTROOT"/etc/rc.d/S??$name + rm -f "$IPKG_INSTROOT"/etc/rc.d/K??$name } enable() { name="$(basename "${initscript}")" disable - ln -s "/etc/init.d/$name" "$IPKG_INSTROOT/etc/rc.d/S${START}${name##S[0-9][0-9]}" + [ "$START" ] && ln -s "/etc/init.d/$name" "$IPKG_INSTROOT/etc/rc.d/S${START}${name##S[0-9][0-9]}" + [ "$STOP" ] && ln -s "/etc/init.d/$name" "$IPKG_INSTROOT/etc/rc.d/K${STOP}${name##K[0-9][0-9]}" +} + +enabled() { + name="$(basename "${initscript}")" + [ -x "$IPKG_INSTROOT/etc/rc.d/S${START}${name##S[0-9][0-9]}" ] } depends() { @@ -61,23 +67,26 @@ EOF } initscript="$1" -action="$2" +[ "$#" -ge 1 ] && shift +action="$1" +[ "$#" -ge 1 ] && shift . "$initscript" cmds= for cmd in $EXTRA_COMMANDS; do - cmds="${cmds:+$cmds$N}$cmd) $cmd;;" + cmds="${cmds:+$cmds$N}$cmd) $cmd \"\$@\";;" done eval "case \"\$action\" in - start) start;; - stop) stop;; - reload) reload || restart;; - restart) restart;; - boot) boot;; - shutdown) shutdown;; - enable) enable;; - disable) disable;; + start) start \"\$@\";; + stop) stop \"\$@\";; + reload) reload \"\$@\" || restart \"\$@\";; + restart) restart \"\$@\";; + boot) boot \"\$@\";; + shutdown) shutdown \"\$@\";; + enable) enable \"\$@\";; + enabled) enabled \"\$@\";; + disable) disable \"\$@\";; $cmds *) help;; esac"