summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-04-01 20:23:17 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-04-01 20:23:17 +0000
commitfda46acab967f01269eac5a501c72b10d48d2bc4 (patch)
tree7e49aebbb9f9bfb747d6bd0bad77ae87b0b166b3
parent91221166b90ccdb1a0486bf2598b96c0e03809bc (diff)
port changes in whiterussian ([3341]) to trunk.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3574 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/ez-ipupdate/Makefile15
-rw-r--r--package/ez-ipupdate/files/ez-ipupdate.conf4
-rw-r--r--package/ez-ipupdate/files/ez-ipupdate.hotplug12
-rw-r--r--package/ez-ipupdate/ipkg/ez-ipupdate.conffiles1
4 files changed, 19 insertions, 13 deletions
diff --git a/package/ez-ipupdate/Makefile b/package/ez-ipupdate/Makefile
index ce2583a4b..92d752764 100644
--- a/package/ez-ipupdate/Makefile
+++ b/package/ez-ipupdate/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ez-ipupdate
PKG_VERSION:=3.0.11b8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_MD5SUM:=000211add4c4845ffa4211841bff4fb0
PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/e/ez-ipupdate \
@@ -46,11 +46,12 @@ $(PKG_BUILD_DIR)/.built:
touch $@
$(IPKG_EZIPUPDATE):
- install -m0755 -d $(IDIR_EZIPUPDATE)/etc/init.d $(IDIR_EZIPUPDATE)/etc/hotplug.d/iface $(IDIR_EZIPUPDATE)/usr/sbin/
- install -m0755 $(PKG_BUILD_DIR)/ez-ipupdate $(IDIR_EZIPUPDATE)/usr/sbin/
- install -m0755 files/$(PKG_NAME).init $(IDIR_EZIPUPDATE)/etc/init.d/S80$(PKG_NAME)
- install -m0755 files/$(PKG_NAME).conf $(IDIR_EZIPUPDATE)/etc/
- install -m0755 files/$(PKG_NAME).hotplug $(IDIR_EZIPUPDATE)/etc/hotplug.d/iface/10-$(PKG_NAME)
- $(STRIP) $(IDIR_EZIPUPDATE)/usr/sbin/*
+ install -d -m0755 $(IDIR_EZIPUPDATE)/etc
+ install -m0600 ./files/$(PKG_NAME).conf $(IDIR_EZIPUPDATE)/etc/
+ install -d -m0755 $(IDIR_EZIPUPDATE)/etc/hotplug.d/iface
+ install -m0755 ./files/$(PKG_NAME).hotplug $(IDIR_EZIPUPDATE)/etc/hotplug.d/iface/10-$(PKG_NAME)
+ install -d -m0755 $(IDIR_EZIPUPDATE)/usr/sbin
+ install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_EZIPUPDATE)/usr/sbin/
+ $(RSTRIP) $(IDIR_EZIPUPDATE)
$(IPKG_BUILD) $(IDIR_EZIPUPDATE) $(PACKAGE_DIR)
diff --git a/package/ez-ipupdate/files/ez-ipupdate.conf b/package/ez-ipupdate/files/ez-ipupdate.conf
index ac2d2ce7d..cb98275fd 100644
--- a/package/ez-ipupdate/files/ez-ipupdate.conf
+++ b/package/ez-ipupdate/files/ez-ipupdate.conf
@@ -1,8 +1,8 @@
service-type=zoneedit
user=myname:mypassword
-interface=WAN_IFNAME
host=mydomain.com
+quiet
# Do not change the lines below
-cache-file=/tmp/ez-ipup
+cache-file=/tmp/ez-ipupdate.cache
pid-file=/var/run/ez-ipupdate.pid
diff --git a/package/ez-ipupdate/files/ez-ipupdate.hotplug b/package/ez-ipupdate/files/ez-ipupdate.hotplug
index 56a054b4a..eb7ab326c 100644
--- a/package/ez-ipupdate/files/ez-ipupdate.hotplug
+++ b/package/ez-ipupdate/files/ez-ipupdate.hotplug
@@ -1,6 +1,10 @@
-PGM=ez-ipupdate
+. /etc/functions.sh
+NAME=ez-ipupdate
+CONFIG=/etc/$NAME.conf
+COMMAND=/usr/sbin/$NAME
[ "$ACTION" = "ifup" -a "$INTERFACE" = "wan" ] && {
- [ -e /etc/$PGM.conf ] && {
- [ -n $(grep "user=" /etc/$PGM.conf | cut -d= -f2 | cut -d: -f1) ] && [ -n $(grep "user=" /etc/$PGM.conf | cut -d= -f2 | cut -d: -f2) ] && /usr/sbin/$PGM -c /etc/$PGM.conf &
- }
+ [ -x $COMMAND ] && [ -r $CONFIG ] && {
+ IFNAME=$(nvram get ${INTERFACE}_ifname)
+ $COMMAND -c $CONFIG -i $IFNAME 2>&1 | logger -t $NAME
+ } &
}
diff --git a/package/ez-ipupdate/ipkg/ez-ipupdate.conffiles b/package/ez-ipupdate/ipkg/ez-ipupdate.conffiles
new file mode 100644
index 000000000..3a9041e34
--- /dev/null
+++ b/package/ez-ipupdate/ipkg/ez-ipupdate.conffiles
@@ -0,0 +1 @@
+/etc/ez-ipupdate.conf