--- /lib/rcscripts/net.modules.d/pppd 2005-11-10 11:01:57.000000000 +0000 +++ pppd 2005-11-10 09:36:44.000000000 +0000 @@ -101,8 +101,6 @@ # # Returns 0 (true) when successful, otherwise 1 pppd_start() { - ${IN_BACKGROUND} && return 0 - local iface="$1" ifvar=$( bash_variable "$1" ) opts="" link if [[ ${iface%%[0-9]*} != "ppp" ]]; then eerror "PPP can only be invoked from net.ppp[0-9]" @@ -144,8 +142,8 @@ # Load any commandline options eval opts=\"\$\{pppd_${ifvar}\[@\]}\" - # We don't work with these options set by the user - for i in unit nodetach linkname maxfail persist ; 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 @@ -230,15 +228,12 @@ [[ ${insert_link_in_opts} -eq 0 ]] || opts="${link} ${opts}" ebegin "Running pppd" - mark_service_inactive "net.${iface}" i=$( eval /usr/sbin/pppd ${opts} 2>&1 ) eend $? "${i}" || return 1 if [[ " ${opts} " == *" updetach "* ]]; then local addr=$( interface_get_address "${iface}" ) einfo "${iface} received address ${addr}" - else - go_background fi } @@ -249,7 +244,6 @@ # Returns 0 (true) if no process to kill or it terminates successfully, # otherwise non-zero (false) pppd_stop() { - ${IN_BACKGROUND} && return 0 local iface="$1" pidfile="/var/run/ppp-$1.pid" [[ ! -s ${pidfile} ]] && return 0