Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 81674
Collapse All | Expand All

(-)/root/adsl.orig (-8 / +11 lines)
Lines 77-87 Link Here
77
	eval user=\"\$\{adsl_user_${ifvar}\}\"
77
	eval user=\"\$\{adsl_user_${ifvar}\}\"
78
78
79
	[ "${user}" = "" ] && user=$(
80
		unset USER
81
		source ${cfgfile} &> ${devnull}
82
		echo ${USER}
83
	)
84
79
	# Start ADSL with the cfgfile, but override ETH and PIDFILE
85
	# Start ADSL with the cfgfile, but override ETH and PIDFILE
80
	einfo "Starting ADSL for ${iface}"
86
	einfo "Starting ADSL for ${iface}"
81
	/usr/sbin/adsl-start <(cat ${cfgfile}; \
87
	GENTOO_PIDFILE=/var/run/adsl-${iface}.pid /usr/sbin/adsl-start \
82
		echo "ETH=${iface}"; \
88
		"${iface}" "${user}" "${cfgfile}"  \
83
		echo "PIDFILE=/var/run/adsl-${iface}.pid"; \
89
		> ${devnull}
84
		[[ -n ${user} ]] && echo "USER=${user}") \
85
		>${devnull}
86
	eend $? || return $?
90
	eend $? || return $?
87
	return 0
91
	return 0
Lines 105-111 Link Here
105
109
106
	einfo "Stopping ADSL for ${iface}"
110
	einfo "Stopping ADSL for ${iface}"
107
	/usr/sbin/adsl-stop <(cat ${cfgfile}; \
111
	GENTOO_PIDFILE=/var/run/adsl-${iface}.pid /usr/sbin/adsl-stop \
108
		echo "ETH=${iface}"; echo "PIDFILE=/var/run/adsl-${iface}.pid") \
112
		 ${cfgfile} >${devnull}
109
		>${devnull}
110
	eend $?
113
	eend $?
111
114

Return to bug 81674