Changeset 28365 for branches/backfire


Ignore:
Timestamp:
2011-10-05T01:12:35+02:00 (5 years ago)
Author:
jow
Message:

[backfire] backport r28364

Location:
branches/backfire/package/ppp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/ppp/Makefile

    r25045 r28365  
    11# 
    2 # Copyright (C) 2006-2010 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1111PKG_NAME:=ppp 
    1212PKG_VERSION:=2.4.4 
    13 PKG_RELEASE:=16 
     13PKG_RELEASE:=16.1 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
  • branches/backfire/package/ppp/files/ppp.sh

    r23095 r28365  
    1616start_pppd() { 
    1717        local cfg="$1"; shift 
     18 
     19        # Workaround for PPPoE service and AC name options, 
     20        # filter out the nic-* argument and append it as last option 
     21        local nic="" 
     22        case "$1" in 
     23                nic-*) nic="$1"; shift ;; 
     24        esac 
    1825 
    1926        local proto 
     
    111118                ${ipv6} \ 
    112119                ${pppd_options} \ 
    113                 nodetach 
     120                nodetach \ 
     121                ${nic} 
    114122 
    115123        lock -u "/var/lock/ppp-${link}" 
  • branches/backfire/package/ppp/files/pppoe.sh

    r21564 r28365  
    1414        mtu=${mtu:-1492} 
    1515        start_pppd "$config" \ 
     16                "nic-$iface" \ 
    1617                plugin rp-pppoe.so \ 
    17                 mtu $mtu mru $mtu \ 
    18                 "nic-$iface" 
     18                mtu $mtu mru $mtu 
    1919} 
Note: See TracChangeset for help on using the changeset viewer.