diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/dropbear/files | |
parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/dropbear/files')
-rw-r--r-- | package/dropbear/files/dropbear.init | 4 | ||||
-rw-r--r-- | package/dropbear/files/dropbear.postinst | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init index b1623c919..4a7d7a875 100644 --- a/package/dropbear/files/dropbear.init +++ b/package/dropbear/files/dropbear.init @@ -10,7 +10,7 @@ bothlog() { case $1 in autostop) ;; autostart) - [[ $dropbear_flags = NO ]] && exit 0 + test x"${dropbear:-NO}" = x"NO" && exit 0 exec sh $0 start ;; start) @@ -30,7 +30,7 @@ start) /usr/sbin/dropbear $dropbear_flags ;; stop) - killall dropbear + pkill dropbear ;; restart) sh $0 stop diff --git a/package/dropbear/files/dropbear.postinst b/package/dropbear/files/dropbear.postinst index b09c34147..11c7923bb 100644 --- a/package/dropbear/files/dropbear.postinst +++ b/package/dropbear/files/dropbear.postinst @@ -1,3 +1,4 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh add_rcconf '"NO" to disable' dropbear_flags " " +add_rcconf dropbear dropbear YES |