From 45777544366cfb74404c13cc1daa58265cc0f5d0 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 3 Jul 2005 18:02:34 +0000
Subject: [PATCH] remove pppoe init script, add ifup.pppoe for that

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1325 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/ppp/Makefile                         | 5 +++--
 package/ppp/files/{pppoe.init => ifup.pppoe} | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename package/ppp/files/{pppoe.init => ifup.pppoe} (90%)

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index e1c3907ce..1b95a76c7 100644
--- a/package/ppp/Makefile
+++ b/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/package/ppp/files/pppoe.init b/package/ppp/files/ifup.pppoe
similarity index 90%
rename from package/ppp/files/pppoe.init
rename to package/ppp/files/ifup.pppoe
index d0cfa261a..caf06f76c 100644
--- a/package/ppp/files/pppoe.init
+++ b/package/ppp/files/ifup.pppoe
@@ -1,9 +1,9 @@
 #!/bin/sh
-
 . /etc/functions.sh
+IF_NAME=$1
 
-WAN_PROTO=$(nvram get wan_proto)
-[ "$WAN_PROTO" = "pppoe" ] || exit 0
+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
-- 
2.20.1