[gentoo-commits] proj/netifrc:master commit in: net/

[Robin H. Johnson]

commit:     b3848b828d4f1cabe9bda54a0d9da473e5df3e9a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 08:09:22 2020 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun May 31 05:13:18 2020 +0000
URL:        https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=b3848b82

net/dhcpcd.sh: Put user args into a temp file

So we still use the correct PID even if the user has changed his
configuration between start and stop.

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 net/dhcpcd.sh | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/net/dhcpcd.sh b/net/dhcpcd.sh
index c0639e0..dcc6817 100644
--- a/net/dhcpcd.sh
+++ b/net/dhcpcd.sh
@@ -16,11 +16,14 @@ _config_vars="$_config_vars dhcp dhcpcd"
 
 dhcpcd_start()
 {
-	# check for pidfile after we gathered the user's opts because they can
+	# check for pidfile after we gathered the user's args because they can
 	# alter the pidfile's name (#718114)
-	local args= opt= pidfile= opts= new=true
+	# Save the args into a file so dhcpcd_stop can later re-use the very
+	# same args later.
+	local args= opt= pidfile= opts= new=true argsfile=/run/netifrc_dhcpcd_${IFACE}_args
 	eval args=\$dhcpcd_${IFVAR}
 	[ -z "${args}" ] && args=${dhcpcd}
+	echo "${args}" > ${argsfile}
 	pidfile="$(dhcpcd -P ${args} ${IFACE})"
 
 	# Get our options
@@ -78,12 +81,16 @@ dhcpcd_start()
 
 dhcpcd_stop()
 {
-	local args= pidfile= opts= sig=SIGTERM
+	local args= pidfile= opts= sig=SIGTERM argsfile=/run/netifrc_dhcpcd_${IFACE}_args
 
-	# check for pidfile after we gathered the user's opts because they can
+	# check for pidfile after we gathered the user's args because they can
 	# alter the pidfile's name (#718114)
-	eval args=\$dhcpcd_${IFVAR}
-	[ -z "${args}" ] && args=${dhcpcd}
+	if [ -f "${argsfile}" ] ; then
+		args="$(cat ${argsfile})"
+	else
+		eval args=\$dhcpcd_${IFVAR}
+		[ -z "${args}" ] && args=${dhcpcd}
+	fi
 	pidfile="$(dhcpcd -P ${args} ${IFACE})"
 	[ ! -f "${pidfile}" ] && return 0
 
@@ -94,5 +101,6 @@ dhcpcd_stop()
 		*" release "*) dhcpcd -k "${IFACE}" ;;
 		*) dhcpcd -x "${IFACE}" ;;
 	esac
+	[ -f "${argsfile}" ] && rm -f "${argsfile}"
 	eend $?
 }