webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

dhcpcd: new pid path for dhcpcd 9.x

Browse Source 
dhcpcd 9.x move the path of the pids to an own folder.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2020-04-19 15:24:02 +02:00
parent 03e4f8d60e
commit 18136c5ce9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/initscripts/networking/functions.network
View File

@@ -25,7 +25,7 @@ dhcpcd_get_pid() {
# network device, if a pidfile exists.
local device="$1"
local pidfile="/var/run/dhcpcd-${device}.pid"
local pidfile="/var/run/dhcpcd/${device}.pid"
# Check if a pid file exists.
if [ -f "${pidfile}" ] ; then

6
src/initscripts/networking/red
View File

@@ -228,13 +228,13 @@ case "${1}" in
TYPE="pppoe"
fi
if [ "${IPTV}" == "enable" ]; then
PIDFILE="/var/run/dhcpcd-${DEVICE}.${IPTV_VLAN}.pid"
PIDFILE="/var/run/dhcpcd/${DEVICE}.${IPTV_VLAN}.pid"
LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${IPTV_VLAN}.info"
# Test to see if there is a stale pid file
if [ -f "$PIDFILE" ]; then
ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
if [ $? != 0 ]; then
rm -f /var/run/dhcpcd-${DEVICE}.${IPTV_VLAN}.pid > /dev/null
rm -f /var/run/dhcpcd/${DEVICE}.${IPTV_VLAN}.pid > /dev/null
fi
fi
@@ -289,7 +289,7 @@ case "${1}" in
if [ -f "$PIDFILE" ]; then
ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
if [ $? != 0 ]; then
rm -f /var/run/dhcpcd-${DEVICE}.pid > /dev/null
rm -f /var/run/dhcpcd/${DEVICE}.pid > /dev/null
fi
fi