Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 72560 Details for
Bug 112049
baselayout-1.12.0_pre10 : pppd net module - updetach & linkname pppd params
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
pppd.diff
pppd.diff (text/plain), 2.05 KB, created by
Alin Năstac (RETIRED)
on 2005-11-10 00:31:36 UTC
(
hide
)
Description:
pppd.diff
Filename:
MIME Type:
Creator:
Alin Năstac (RETIRED)
Created:
2005-11-10 00:31:36 UTC
Size:
2.05 KB
patch
obsolete
>--- pppd.orig 2005-10-27 19:14:04.000000000 +0300 >+++ pppd 2005-11-10 10:15:41.000000000 +0200 >@@ -142,8 +142,8 @@ > # Load any commandline options > eval opts=\"\$\{pppd_${ifvar}\[@\]}\" > >- # We don't work if nodetach or unit is set >- for i in nodetach updetach unit ; do >+ # We don't work if unit, no detach or linkname is set. >+ for i in unit nodetach linkname ; do > if [[ " ${opts} " == *" ${i} "* ]]; then > eerror "The option \"${i}\" is not allowed" > return 1 >@@ -158,9 +158,9 @@ > [[ " ${opts} " != *" mru "* ]] && opts="${opts} mru ${mtu}" > fi > >- # Detach if we're not idling >- [[ " ${opts} " != *" idle "* && " ${opts} " != *" updetach "* ]] \ >- && opts="${opts} updetach" >+ # Set linkname because we need /var/run/ppp-${linkname}.pid >+ # This pidfile has the advantage of being there, even if ${iface} interface was never started >+ opts="linkname ${iface} ${opts}" > > # Setup auth info > [[ -n ${username} ]] && opts="user \"${username}\" ${opts}" >@@ -228,11 +228,13 @@ > [[ ${insert_link_in_opts} -eq 0 ]] || opts="${link} ${opts}" > > ebegin "Running pppd" >- i=$( eval /usr/sbin/pppd ${opts} ) >+ i=$( eval /usr/sbin/pppd ${opts} 2>&1 ) > eend $? "${i}" || return 1 > >- local addr=$( interface_get_address "${iface}" ) >- einfo "${iface} received address ${addr}" >+ if [[ " ${opts} " == *" updetach "* ]]; then >+ local addr=$( interface_get_address "${iface}" ) >+ einfo "${iface} received address ${addr}" >+ fi > } > > # bool pppd_stop(char *iface) >@@ -242,11 +244,12 @@ > # Returns 0 (true) if no process to kill or it terminates successfully, > # otherwise non-zero (false) > pppd_stop() { >- local iface="$1" pidfile="/var/run/$1.pid" >+ local iface="$1" pidfile="/var/run/ppp-$1.pid" > > [[ ! -s ${pidfile} ]] && return 0 > >- local pid=$(<"${pidfile}") >+ local pid >+ read pid <"${pidfile}" #PID is the first line of the pidfile > einfo "Stopping pppd on ${iface}" > kill -s TERM "${pid}" > process_finished "${pid}" /usr/sbin/pppd
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 112049
:
72560
|
72561
|
72573
|
72605
|
72608
|
72644
|
72645
|
72807
|
72808
|
72809
|
72810
|
72868
|
72885
|
72938
|
72992
|
73062
|
73143