[patch] removes ugly hack (and adds new one)

adsl.patch (text/plain), 1020 bytes, created by Olivier Crete (RETIRED) on 2005-02-11 16:23:19 UTC

--- /root/adsl.orig	2005-01-17 19:01:15.810297048 -0500
+++ /lib/rcscripts/net.modules.d/adsl	2005-01-17 20:12:01.322881032 -0500
@@ -77,11 +77,15 @@
 	eval user=\"\$\{adsl_user_${ifvar}\}\"
 
+	[ "${user}" = "" ] && user=$(
+		unset USER
+		source ${cfgfile} &> ${devnull}
+		echo ${USER}
+	)
+
 	# Start ADSL with the cfgfile, but override ETH and PIDFILE
 	einfo "Starting ADSL for ${iface}"
-	/usr/sbin/adsl-start <(cat ${cfgfile}; \
-		echo "ETH=${iface}"; \
-		echo "PIDFILE=/var/run/adsl-${iface}.pid"; \
-		[[ -n ${user} ]] && echo "USER=${user}") \
-		>${devnull}
+	GENTOO_PIDFILE=/var/run/adsl-${iface}.pid /usr/sbin/adsl-start \
+		"${iface}" "${user}" "${cfgfile}"  \
+		> ${devnull}
 	eend $? || return $?
 	return 0
@@ -105,7 +109,6 @@
 
 	einfo "Stopping ADSL for ${iface}"
-	/usr/sbin/adsl-stop <(cat ${cfgfile}; \
-		echo "ETH=${iface}"; echo "PIDFILE=/var/run/adsl-${iface}.pid") \
-		>${devnull}
+	GENTOO_PIDFILE=/var/run/adsl-${iface}.pid /usr/sbin/adsl-stop \
+		 ${cfgfile} >${devnull}
 	eend $?