remove pppoe init script, add ifup.pppoe for that

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1325 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/ppp/Makefile b/openwrt/package/ppp/Makefile
index e1c3907..1b95a76 100644 (file)
--- a/openwrt/package/ppp/Makefile
+++ b/openwrt/package/ppp/Makefile
@@ -70,6 +70,7 @@ $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC=$(TARGET_CC) \
                COPTS="$(TARGET_CFLAGS)" \
+               HAVE_INET6="1" \
                DESTDIR="$(PKG_INSTALL_DIR)/usr" \
                all install
        touch $@
@@ -88,8 +89,8 @@ $(IPKG_PPP):
        $(IPKG_BUILD) $(IDIR_PPP) $(PACKAGE_DIR)
        
 $(IDIR_PPP_MOD_PPPOE)/etc/init.d/S50pppoe:
-       install -d -m0755 $(IDIR_PPP_MOD_PPPOE)/etc/init.d
-       install -m0755 ./files/pppoe.init $(IDIR_PPP_MOD_PPPOE)/etc/init.d/S50pppoe
+       install -d -m0755 $(IDIR_PPP_MOD_PPPOE)/sbin
+       install -m0755 ./files/ifup.pppoe $(IDIR_PPP_MOD_PPPOE)/sbin/
 
 $(IPKG_PPP_MOD_PPPOE): $(IDIR_PPP_MOD_PPPOE)/etc/init.d/S50pppoe
 

diff --git a/openwrt/package/ppp/files/ifup.pppoe b/openwrt/package/ppp/files/ifup.pppoe
new file mode 100644 (file)
index 0000000..caf06f7
--- /dev/null
+++ b/openwrt/package/ppp/files/ifup.pppoe
@@ -0,0 +1,29 @@
+#!/bin/sh
+. /etc/functions.sh
+IF_NAME=$1
+
+PROTO=$(nvram get ${IF_NAME}_proto)
+[ "$PROTO" = "pppoe" ] || exit 0
+
+for module in slhc ppp_generic pppox pppoe; do
+       /sbin/insmod $module 2>/dev/null >/dev/null
+done
+
+(
+       while true; do
+               IFNAME=$(nvram get pppoe_ifname)
+               USERNAME=$(nvram get ppp_username)
+               PASSWORD=$(nvram get ppp_passwd)
+               REDIAL=$(nvram get ppp_redialperiod)
+               REDIAL=${REDIAL:+lcp-echo-interval $REDIAL}
+               IDLETIME=$(nvram get ppp_idletime)
+               IDLETIME=${IDLETIME:+lcp-echo-failure $IDLETIME}
+               MTUV=$(nvram get ppp_mtu)
+               MTU=${MTUV:+mtu $MTUV}
+               MRU=${MTUV:+mru $MTUV}
+
+               ifconfig $IFNAME up
+               echo -e "plugin rp-pppoe.so\nconnect /bin/true\nusepeerdns\ndefaultroute\nuser \"$USERNAME\"\npassword \"$PASSWORD\"\n$MTU\n$MRU\n$IDLETIME\n$REDIAL" > /tmp/.pppoe-data
+               /usr/sbin/pppd nodetach file /tmp/.pppoe-data $IFNAME
+       done
+) &

diff --git a/openwrt/package/ppp/files/pppoe.init b/openwrt/package/ppp/files/pppoe.init
deleted file mode 100644 (file)
index d0cfa26..0000000
--- a/openwrt/package/ppp/files/pppoe.init
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-. /etc/functions.sh
-
-WAN_PROTO=$(nvram get wan_proto)
-[ "$WAN_PROTO" = "pppoe" ] || exit 0
-
-for module in slhc ppp_generic pppox pppoe; do
-       /sbin/insmod $module 2>/dev/null >/dev/null
-done
-
-(
-       while true; do
-               IFNAME=$(nvram get pppoe_ifname)
-               USERNAME=$(nvram get ppp_username)
-               PASSWORD=$(nvram get ppp_passwd)
-               REDIAL=$(nvram get ppp_redialperiod)
-               REDIAL=${REDIAL:+lcp-echo-interval $REDIAL}
-               IDLETIME=$(nvram get ppp_idletime)
-               IDLETIME=${IDLETIME:+lcp-echo-failure $IDLETIME}
-               MTUV=$(nvram get ppp_mtu)
-               MTU=${MTUV:+mtu $MTUV}
-               MRU=${MTUV:+mru $MTUV}
-
-               ifconfig $IFNAME up
-               echo -e "plugin rp-pppoe.so\nconnect /bin/true\nusepeerdns\ndefaultroute\nuser \"$USERNAME\"\npassword \"$PASSWORD\"\n$MTU\n$MRU\n$IDLETIME\n$REDIAL" > /tmp/.pppoe-data
-               /usr/sbin/pppd nodetach file /tmp/.pppoe-data $IFNAME
-       done
-) &