Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 112049 | Differences between
and this patch

Collapse All | Expand All

(-)pppd.orig (-4 / +11 lines)
Lines 16-23 Link Here
16
# Returns 1 if pppd is installed, otherwise 0
16
# Returns 1 if pppd is installed, otherwise 0
17
pppd_check_installed() {
17
pppd_check_installed() {
18
    if [[ ! -x /usr/sbin/pppd ]]; then
18
    if [[ ! -x /usr/sbin/pppd ]]; then
19
    ${1:-false} && eerror "For PPP support, emerge net-dialup/ppp"
19
        ${1:-false} && eerror "For PPP support, emerge net-dialup/ppp"
20
    return 1
20
        return 1
21
    fi
21
    fi
22
    return 0
22
    return 0
23
}
23
}
Lines 114-121 Link Here
114
    fi
116
    fi
115
117
116
    # PPP requires a link to communicate over - normally a serial port
118
    # PPP requires a link to communicate over - normally a serial port
117
    # PPPoE communicates over ethernet
119
    # PPPoE communicates over Ethernet
118
    # PPPoA communictes over ATM
120
    # PPPoA communicates over ATM
119
    # In all cases, the link needs to be available before we start PPP
121
    # In all cases, the link needs to be available before we start PPP
120
    eval link=\"\$\{link_${ifvar}\}\"
122
    eval link=\"\$\{link_${ifvar}\}\"
121
    if [[ -z ${link} ]]; then
123
    if [[ -z ${link} ]]; then
Lines 225-230 Link Here
225
227
226
        insert_link_in_opts=0
228
        insert_link_in_opts=0
227
    fi
229
    fi
230
    if [[ " ${opts} " == *" plugin pppoatm.so "* ]]; then
231
        # Load the pppoa kernel module - if this fails, we have to hope
232
        # that pppoa support is compiled into the kernel
233
        modprobe pppoatm 2>/dev/null
234
    fi
228
    [[ ${insert_link_in_opts} -eq 0 ]] || opts="${link} ${opts}"
235
    [[ ${insert_link_in_opts} -eq 0 ]] || opts="${link} ${opts}"
229
    
236
    
230
    ebegin "Running pppd"
237
    ebegin "Running pppd"
Lines 234-239 Link Here
234
    if [[ " ${opts} " == *" updetach "* ]]; then
241
    if [[ " ${opts} " == *" updetach "* ]]; then
235
        local addr=$( interface_get_address "${iface}" )
242
        local addr=$( interface_get_address "${iface}" )
236
        einfo "${iface} received address ${addr}"
243
        einfo "${iface} received address ${addr}"
244
    else
245
        go_background
237
    fi
246
    fi
238
}
247
}
239
248

Return to bug 112049