hopefully fix duplicate ppp instances (#895)

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

diff --git a/package/base-files/default/etc/rc.common b/package/base-files/default/etc/rc.common
index 4a90a25..7180b0f 100755 (executable)
--- a/package/base-files/default/etc/rc.common
+++ b/package/base-files/default/etc/rc.common
@@ -1,5 +1,9 @@
 #!/bin/sh
 #!/bin/sh

-. /etc/functions.sh
+# Copyright (C) 2006 OpenWrt.org
+
+. $IPKG_INSTROOT/etc/functions.sh
+
+START=50

 
 start() {
        return 0
 
 start() {
        return 0


@@ -27,12 +31,14 @@ shutdown() {
 }
 
 disable() {
 }
 
 disable() {

-       rm -f /etc/rc.d/${initscript##*/}
+       name="$(basename "${initscript}")"
+       rm -f "$IPKG_INSTROOT"/etc/rc.d/S??$name

 }
 
 enable() {
 }
 
 enable() {

+       name="$(basename "${initscript}")"

        disable
        disable

-       ln -s /etc/init.d/${initscript##*/} /etc/rc.d/${initscript##*/}
+       ln -s "/etc/init.d/$name" "$IPKG_INSTROOT/etc/rc.d/S${START}${name##S[0-9][0-9]}"

 }
 
 depends() {
 }
 
 depends() {


@@ -41,15 +47,15 @@ depends() {
 
 help() {
        cat <<EOF
 
 help() {
        cat <<EOF

-Syntax: $0 [command]
+Syntax: $initscript [command]

 
 Available commands:
        start   Start the service
        stop    Stop the service
        restart Restart the service
        reload  Reload configuration files (or restart if that fails)
 
 Available commands:
        start   Start the service
        stop    Stop the service
        restart Restart the service
        reload  Reload configuration files (or restart if that fails)

-       enable  Enable the service (load at boot time)
-       disable Disable the service
+       enable  Enable service autostart
+       disable Disable service autostart

 $EXTRA_HELP
 EOF
 }
 $EXTRA_HELP
 EOF
 }


@@ -61,17 +67,17 @@ action="$2"
 
 cmds=
 for cmd in $EXTRA_COMMANDS; do
 
 cmds=
 for cmd in $EXTRA_COMMANDS; do

-       cmds="$cmd) $cmd;;"
+       cmds="${cmds:+$cmds$N}$cmd) $cmd;;"

 done
 eval "case \"\$action\" in
        start) start;;
        stop) stop;;
        reload) reload || restart;;
        restart) restart;;
 done
 eval "case \"\$action\" in
        start) start;;
        stop) stop;;
        reload) reload || restart;;
        restart) restart;;

-       enable) enable;;
-       disable) disable;;

        boot) boot;;
        shutdown) shutdown;;
        boot) boot;;
        shutdown) shutdown;;

+       enable) enable;;
+       disable) disable;;

        $cmds
        *) help;;
 esac"
        $cmds
        *) help;;
 esac"