mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 03:13:20 +02:00
move ppp plugins default search path and (hopefully) fix pppoe reconnect issue
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@497 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
1dbacbde8f
commit
63b38d2aae
@ -116,10 +116,10 @@ $(IPKG_STATE_DIR)/info/ppp.list: $(PKG_PPP)
|
||||
$(PKG_PPP_PPPOE_PLUGIN): $(PKG_PPP)
|
||||
$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP_PPPOE_PLUGIN) control/ppp-pppoe-plugin.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
|
||||
cp -af ./ipkg/ppp-pppoe-plugin/* $(I_PPP_PPPOE_PLUGIN)
|
||||
mkdir -p $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/rp-pppoe
|
||||
mkdir -p $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)
|
||||
cp -af $(PKG_BUILD_DIR)/pppd/plugins/rp-pppoe/rp-pppoe.so \
|
||||
$(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/rp-pppoe
|
||||
$(STRIP) $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/*/*.so
|
||||
$(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)
|
||||
$(STRIP) $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)/*.so
|
||||
mkdir -p $(I_PPP_PPPOE_PLUGIN)/$(MODULES_SUBDIR)
|
||||
cp $(MODULES_DIR)/kernel/drivers/net/pppo*.o $(I_PPP_PPPOE_PLUGIN)/$(MODULES_SUBDIR)
|
||||
find $(I_PPP_PPPOE_PLUGIN) -name CVS | xargs rm -rf
|
||||
@ -130,10 +130,10 @@ $(IPKG_STATE_DIR)/info/ppp-pppoe-plugin.list: $(PKG_PPP_PPPOE_PLUGIN)
|
||||
|
||||
$(PKG_PPP_RADIUS_PLUGIN): $(PKG_PPP)
|
||||
$(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP_RADIUS_PLUGIN) control/ppp-radius-plugin.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
|
||||
mkdir -p $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/radius
|
||||
mkdir -p $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)
|
||||
cp -af $(PKG_BUILD_DIR)/pppd/plugins/radius/radius.so \
|
||||
$(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/radius/
|
||||
$(STRIP) $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/*/*.so
|
||||
$(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)
|
||||
$(STRIP) $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/$(PKG_VERSION)/*.so
|
||||
find $(I_PPP_RADIUS_PLUGIN) -name CVS | xargs rm -rf
|
||||
$(IPKG_BUILD) $(I_PPP_RADIUS_PLUGIN) $(PACKAGE_DIR)
|
||||
|
||||
|
@ -6,7 +6,7 @@ WAN_PROTO=$(nvram get wan_proto)
|
||||
[ "$WAN_PROTO" = "pppoe" ] || exit 0
|
||||
|
||||
for module in slhc ppp_generic pppox pppoe; do
|
||||
insmod $module 2>/dev/null >/dev/null
|
||||
/sbin/insmod $module 2>/dev/null >/dev/null
|
||||
done
|
||||
|
||||
IFNAME=$(nvram get pppoe_ifname)
|
||||
@ -19,5 +19,9 @@ IDLETIME=${IDLETIME:+idle $IDLETIME}
|
||||
MTU=$(nvram get ppp_mtu)
|
||||
|
||||
ifconfig $IFNAME up
|
||||
echo -e "plugin /usr/lib/pppd/rp-pppoe/rp-pppoe.so\nconnect /bin/true\nusepeerdns\ndefaultroute\nuser \"$USERNAME\"\npassword \"$PASSWORD\"\nmtu $MTU\n$IDLETIME\n$REDIAL" > /tmp/.pppoe-data
|
||||
/usr/sbin/pppd file /tmp/.pppoe-data $IFNAME
|
||||
echo -e "plugin rp-pppoe.so\nconnect /bin/true\nusepeerdns\ndefaultroute\nuser \"$USERNAME\"\npassword \"$PASSWORD\"\nmtu $MTU\n$IDLETIME\n$REDIAL" > /tmp/.pppoe-data
|
||||
(
|
||||
while true; do
|
||||
/usr/sbin/pppd nodetach file /tmp/.pppoe-data $IFNAME
|
||||
done
|
||||
) &
|
||||
|
Loading…
Reference in New Issue
Block a user