From 8c85a77312a46f742eb0a8041876942f6e2c286e Mon Sep 17 00:00:00 2001 From: Rémy Oudompheng Date: Sat, 11 Jun 2011 22:58:49 +0200 Subject: More replacing /var/run by /run MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Oudompheng --- contrib/common.hook | 2 +- src/connections/ethernet | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/common.hook b/contrib/common.hook index 88066cf..9018888 100755 --- a/contrib/common.hook +++ b/contrib/common.hook @@ -15,7 +15,7 @@ function RUNDAEMON { force=1 shift elif [[ "$1" = "-d" ]]; then - [[ -e "/var/run/daemons/$2" ]] + [[ -e "/run/daemons/$2" ]] if [ $? -eq 0 ]; then case "$dep" in yes) ;; diff --git a/src/connections/ethernet b/src/connections/ethernet index c824f18..902b603 100644 --- a/src/connections/ethernet +++ b/src/connections/ethernet @@ -54,9 +54,9 @@ ethernet_up() { case "$IP" in dhcp) if checkyesno "${DHCLIENT:-no}"; then - rm -r "/var/run/dhclient-${INTERFACE}.pid" >/dev/null 2>&1 - report_debug ethernet_up dhclient -q -e TIMEOUT="${DHCP_TIMEOUT:-10}" -pf "/var/run/dhclient-$INTERFACE.pid" "$INTERFACE" - if ! dhclient -q -e TIMEOUT="${DHCP_TIMEOUT:-10}" -pf "/var/run/dhclient-${INTERFACE}.pid" ${DHCLIENT_OPTIONS} "$INTERFACE"; then + rm -r "/run/dhclient-${INTERFACE}.pid" >/dev/null 2>&1 + report_debug ethernet_up dhclient -q -e TIMEOUT="${DHCP_TIMEOUT:-10}" -pf "/run/dhclient-$INTERFACE.pid" "$INTERFACE" + if ! dhclient -q -e TIMEOUT="${DHCP_TIMEOUT:-10}" -pf "/run/dhclient-${INTERFACE}.pid" ${DHCLIENT_OPTIONS} "$INTERFACE"; then report_fail "DHCP IP lease attempt failed." stop_80211x return 1 @@ -125,7 +125,7 @@ ethernet_up() { case "$IP6" in dhcp*) if [[ -x /usr/sbin/dhclient ]]; then - _DHCLIENT_PIDFILE=/var/run/dhclient6-${INTERFACE}.pid + _DHCLIENT_PIDFILE=/run/dhclient6-${INTERFACE}.pid if [[ "$IP6" = "dhcp-noaddr" ]]; then sysctl -q -w net.ipv6.conf.$INTERFACE.accept_ra=1 DHCLIENT6_OPTIONS="-S ${DHCLIENT6_OPTIONS}" -- cgit v1.2.3-24-g4f1b