Signed-off-by: Conrad Hirano <[EMAIL PROTECTED]>
Index: packages/net/ndyndns/files/ndyndns.init
===================================================================
--- packages/net/ndyndns/files/ndyndns.init (revision 11746)
+++ packages/net/ndyndns/files/ndyndns.init (working copy)
@@ -1,18 +1,46 @@
#!/bin/sh /etc/rc.common
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2008 OpenWrt.org
-START=80
-DEFAULT=/etc/default/ndyndns
+START=70
+config_cb() {
+ local type
+ config_get type "$CONFIG_SECTION" TYPE
+
+ if [ "$type" = ndyndns ]
+ then
+ config_get DIR $CONFIG_SECTION directory
+ config_get CONFIG $CONFIG_SECTION conf
+ config_get REMOTE $CONFIG_SECTION remote
+
+ CHROOT=${DIR:-/etc/ndyndns}
+
+ case $CONFIG in
+ /*)
+ CONF=$CONFIG
+ ;;
+ *)
+ CONF=$CHROOT/${CONFIG:-ndyndns.conf}
+ ;;
+ esac
+ fi
+}
+
start() {
- [ -f $DEFAULT ] && . $DEFAULT
+ config_load ndyndns
- . /etc/functions.sh
- include /lib/network
- scan_interfaces
- /usr/sbin/ndyndns -c $CHROOT -f $CONFIG -i $(config_get wan ifname)
$OPTIONS
+ if [ ${REMOTE:-0} = 1 ]
+ then
+ /usr/sbin/ndyndns -c $CHROOT -f $CONF -r
+ else
+ include /lib/network
+ scan_interfaces
+ config_get IFNAME wan ifname
+ /usr/sbin/ndyndns -c $CHROOT -f $CONF -i $IFNAME
+ fi
}
stop() {
- killall ndyndns
+ kill $(cat /var/run/ndyndns.pid)
+ rm /var/run/ndyndns.pid
}
Index: packages/net/ndyndns/files/ndyndns.default
===================================================================
--- packages/net/ndyndns/files/ndyndns.default (revision 11746)
+++ packages/net/ndyndns/files/ndyndns.default (working copy)
@@ -1,3 +0,0 @@
-CHROOT="/etc/ndyndns"
-CONFIG="/etc/ndyndns/ndyndns.conf"
-OPTIONS=""
Index: packages/net/ndyndns/files/ndyndns.config
===================================================================
--- packages/net/ndyndns/files/ndyndns.config (revision 0)
+++ packages/net/ndyndns/files/ndyndns.config (revision 0)
@@ -0,0 +1,4 @@
+config ndyndns
+ option directory /etc/ndyndns
+ option conf ndyndns.conf
+ option interface wan
Index: packages/net/ndyndns/Makefile
===================================================================
--- packages/net/ndyndns/Makefile (revision 11746)
+++ packages/net/ndyndns/Makefile (working copy)
@@ -2,7 +2,7 @@
PKG_NAME:=ndyndns
PKG_VERSION:=1.12
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=ndyndns-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://ndyndns.googlecode.com/files
@@ -32,17 +32,16 @@
endef
define Package/ndyndns/conffiles
-/etc/ndyndns/ndyndns.conf.sample
-/etc/default/ndyndns
+/etc/config/ndyndns
endef
define Package/ndyndns/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ndyndns $(1)/usr/sbin
- $(INSTALL_DIR) $(1)/etc/default
- $(INSTALL_BIN) files/$(PKG_NAME).default $(1)/etc/default/$(PKG_NAME)
$(INSTALL_DIR) $(1)/etc/init.d/
$(INSTALL_BIN) files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
+ $(INSTALL_DIR) $(1)/etc/config/
+ $(INSTALL_CONF) files/$(PKG_NAME).config $(1)/etc/config/$(PKG_NAME)
$(INSTALL_DIR) $(1)/etc/$(PKG_NAME)
$(INSTALL_CONF) files/$(PKG_NAME).conf.sample $(1)/etc/$(PKG_NAME)
endef
_______________________________________________
openwrt-devel mailing list
[email protected]
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
