init script cleanup, use /etc/rc.d/ for enabled scripts, /etc/init.d/<pkgname> (enabl...

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/olsrd@5128 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/Makefile b/Makefile
index d9b9c8c4f1e785a826f687ea8ca3b1d4452b44cd..ea857700bcaddce677b526a0335cc9a7a30a0113 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,7 @@ define Package/olsrd/install
        install -d -m0755 $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/olsrd $(1)/usr/sbin/
        install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/olsrd.init $(1)/etc/init.d/S60olsrd
+       install -m0755 ./files/olsrd.init $(1)/etc/init.d/olsrd
 endef
 
 define Package/olsrd-mod-dot-draw/install

diff --git a/files/olsrd.init b/files/olsrd.init
index f59ff7ef88271ca672dba2c4bea170ade4627e1d..3cdd6ae1597ae42340aee08944956c60c2a008a4 100644 (file)
--- a/files/olsrd.init
+++ b/files/olsrd.init
@@ -2,9 +2,9 @@
 # Copyright (C) 2006 OpenWrt.org
 
 DEFAULT=/etc/default/olsrd
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        olsrd $OPTIONS
 }