X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/05adaa9794e41d02870a74a1ed7ba58cc59b9286..2d17b93d5618cc37b3e1a4eafbb62a95a17c339f:/package/base-files/files/etc/rc.common?ds=sidebyside diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common index 7180b0f7f..2b7bf5a11 100755 --- a/package/base-files/files/etc/rc.common +++ b/package/base-files/files/etc/rc.common @@ -1,9 +1,11 @@ #!/bin/sh -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org . $IPKG_INSTROOT/etc/functions.sh -START=50 +initscript=$1 +action=${2:-help} +shift 2 start() { return 0 @@ -18,12 +20,13 @@ reload() { } restart() { - stop - start + trap '' TERM + stop "$@" + start "$@" } boot() { - start + start "$@" } shutdown() { @@ -33,12 +36,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 "../init.d/$name" "$IPKG_INSTROOT/etc/rc.d/S${START}${name##S[0-9][0-9]}" + [ "$STOP" ] && ln -s "../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() { @@ -60,24 +70,9 @@ $EXTRA_HELP EOF } -initscript="$1" -action="$2" - . "$initscript" -cmds= -for cmd in $EXTRA_COMMANDS; do - 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;; - $cmds - *) help;; -esac" +ALL_COMMANDS="start stop reload restart boot shutdown enable disable enabled depends ${EXTRA_COMMANDS}" +list_contains ALL_COMMANDS "$action" || action=help +[ "$action" == reload ] && action='eval reload "$@" || restart "$@" && :' +$action "$@"