--- /lib/rcscripts/net.modules.d/ipppd 2004-12-01 22:13:52.634534344 +0100 +++ ipppd 2004-12-01 21:32:40.932306472 +0100 @@ -23,7 +23,7 @@ # # Returns 1 if isnd4k-utils is installed, otherwise 0 ipppd_check_installed() { - ( [[ -x /sbin/ipppd ]] || [[ -x /usr/sbin/ipppd ]] ) && return 0 + [[ -x /sbin/ipppd ]] && return 0 [[ ${1} == true ]] && eerror "For ISDN (ipppd) support, emerge net-dialup/isdn4k-utils" return 1 } @@ -42,7 +42,7 @@ # # Returns 0 (true) when successful, non-zero otherwise ipppd_pre_start() { - local iface=${1} opts itype=$( get_type ${1} ) ipppdpath=$( which ipppd) + local iface=${1} opts itype=$( get_type ${1} ) # Check that we are a valid isdn interface [[ ${itype} != "ippp" && ${itype} != "isdn" ]] && return 0 @@ -54,8 +54,7 @@ eval opts=\"\$\{ipppd_${iface}\}\" einfo "Starting ipppd for ${iface}" - - ${ipppdpath} ${opts} pidfile /var/run/ipppd-${iface}.pid file /etc/ppp/options.${iface} >${devnull} + /sbin/ipppd ${opts} pidfile /var/run/ipppd-${iface}.pid file /etc/ppp/options.${iface} >${devnull} eend $? || return $? return 0