From patchwork Sun Apr 19 13:24:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Fitzenreiter X-Patchwork-Id: 2988 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 494rC94b5Rz3xQy for ; Sun, 19 Apr 2020 13:24:21 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 494rC76Cv8z2K3; Sun, 19 Apr 2020 13:24:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 494rC70fqxz2ydT; Sun, 19 Apr 2020 13:24:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 494rC51HYgz2xGb for ; Sun, 19 Apr 2020 13:24:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 494rC22hblz1Jf; Sun, 19 Apr 2020 13:24:14 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1587302656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=fhthMvtigIBfaAUyb+VlayIRUljUnzSDdb1GD3z0lMM=; b=xGk/7T9KtA4eROqxH7kf5soJr2ZF3mozcPn0baw3r2W8i8IOERrb5jHzjS12NW+b83cmQj oyyF+iiJ7hU/LcDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1587302656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=fhthMvtigIBfaAUyb+VlayIRUljUnzSDdb1GD3z0lMM=; b=wKD1T/xy1vx96n905qyTqtzBdeisXhq/9yWAfA2km/bBu6I9RbKyYvoYnB4jz1k4y1eXgU 2frcAMuO79ehKaDt4HC5s/lyclWK7jdPFMoeufQoZd+7OWe+J6+/I2gnnGvv8SVKbtIp5C RYhYB7n3y25pK+mbqMml0r48XBBjYPKy024Iu3CLjG63V0mcX9ODSd9OlmBzB/aTCfL0iy xBoD6dWy5dc6LkoNF1779zsCQmBljNjiJg1h4HxnMxnFRZ5n1oHwiZsCdPmrr5vbvJn6xR 6O6Vp52hvEX2rT3wneAvKtyCXq/4I7JmCbyLr7p9hVugOEQXseRQDCnOuHyzFg== From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH] dhcpcd: new pid path for dhcpcd 9.x Date: Sun, 19 Apr 2020 15:24:02 +0200 Message-Id: <20200419132402.26052-1-arne_f@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=arne_f@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arne Fitzenreiter Errors-To: development-bounces@lists.ipfire.org Sender: "Development" dhcpcd 9.x move the path of the pids to an own folder. Signed-off-by: Arne Fitzenreiter --- src/initscripts/networking/functions.network | 2 +- src/initscripts/networking/red | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/initscripts/networking/functions.network b/src/initscripts/networking/functions.network index 17191e7a9..b7ce1c5e0 100644 --- a/src/initscripts/networking/functions.network +++ b/src/initscripts/networking/functions.network @@ -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 diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red index e154cc8b1..db4209b44 100644 --- a/src/initscripts/networking/red +++ b/src/initscripts/networking/red @@ -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