X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b2f43424402231050937792fb8b78d0184643a98..a46cfc6bccf2343230f701e86fa88be1404ca1ce:/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 453cdbf33..79424a637 100755 --- a/package/base-files/files/etc/rc.common +++ b/package/base-files/files/etc/rc.common @@ -1,8 +1,12 @@ #!/bin/sh -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org . $IPKG_INSTROOT/etc/functions.sh +initscript=$1 +action=${2:-help} +shift 2 + start() { return 0 } @@ -17,16 +21,16 @@ reload() { restart() { trap '' TERM - stop - start + stop "$@" + start "$@" } boot() { - start + start "$@" } shutdown() { - return 0 + stop } disable() { @@ -38,8 +42,12 @@ disable() { enable() { name="$(basename "${initscript}")" disable - [ "$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${START}${name##K[0-9][0-9]}" + [ -n "$START" -o -n "$STOP" ] || { + echo "/etc/init.d/$name does not have a START or STOP value" + return 1 + } + [ "$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() { @@ -66,25 +74,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;; - enabled) enabled;; - 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 "$@"