diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-07-03 18:02:34 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-07-03 18:02:34 +0000 |
| commit | 45777544366cfb74404c13cc1daa58265cc0f5d0 (patch) | |
| tree | 8631b249c172b63721d481686c8328c73ae075a0 | |
| parent | 8b75caba8c1c686140e05bf3b3b15d1bf793b0fc (diff) | |
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
| -rw-r--r-- | package/ppp/Makefile | 5 | ||||
| -rw-r--r-- | package/ppp/files/ifup.pppoe (renamed from package/ppp/files/pppoe.init) | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile index e1c3907cee..1b95a76c72 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 index d0cfa261ae..caf06f76ca 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 |