From 757b8bcc968fa285e3d78435e30b6c47abc048dc Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Mon, 16 Apr 2007 12:56:43 +0000 Subject: Don't search for a space after interface names in /proc/net, #174792 thanks to Mike Auty. --- ChangeLog | 5 +++++ net.Linux/ifconfig.sh | 6 +++--- net.Linux/iproute2.sh | 7 +++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 968082d7..33984e45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for Gentoo System Intialization ("rc") scripts # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2 + 16 Apr 2007; Roy Marples : + + Don't search for a space after interface names in /proc/net, #174792 + thanks to Mike Auty. + 13 Apr 2007; Roy Marples : Fix module loading, #174360. diff --git a/net.Linux/ifconfig.sh b/net.Linux/ifconfig.sh index 0b0af979..68590bbe 100644 --- a/net.Linux/ifconfig.sh +++ b/net.Linux/ifconfig.sh @@ -15,7 +15,7 @@ _down() { } _exists() { - grep -Eq "^[[:space:]]*${IFACE}:[[:space:]]*" /proc/net/dev + grep -Eq "^[[:space:]]*${IFACE}:" /proc/net/dev } _ifindex() { @@ -24,7 +24,7 @@ _ifindex() { i=$((${i} + 1)) [ ${i} -lt 1 ] && continue case "${line}" in - "${IFACE}: "*) echo "${i}"; return 0;; + "${IFACE}:"*) echo "${i}"; return 0;; esac done < /proc/net/dev return 1 @@ -35,7 +35,7 @@ _is_wireless() { [ -d /sys/class/net/"${IFACE}"/wireless ] && return 0 [ ! -e /proc/net/wireless ] && return 1 - grep -Eq "^[[:space:]]*${IFACE}:[[:space:]]+" /proc/net/wireless + grep -Eq "^[[:space:]]*${IFACE}:" /proc/net/wireless } _get_mac_address() { diff --git a/net.Linux/iproute2.sh b/net.Linux/iproute2.sh index ccab1dbf..2c02b40d 100644 --- a/net.Linux/iproute2.sh +++ b/net.Linux/iproute2.sh @@ -7,7 +7,6 @@ iproute2_depend() { after ifconfig } - _up() { ip link set up dev "${IFACE}" } @@ -17,7 +16,7 @@ _down() { } _exists() { - grep -Eq "^[[:space:]]*${IFACE}:[[:space:]]*" /proc/net/dev + grep -Eq "^[[:space:]]*${IFACE}:" /proc/net/dev } _ifindex() { @@ -26,7 +25,7 @@ _ifindex() { i=$((${i} + 1)) [ ${i} -lt 1 ] && continue case "${line}" in - "${IFACE}: "*) echo "${i}"; return 0;; + "${IFACE}:"*) echo "${i}"; return 0;; esac done < /proc/net/dev return 1 @@ -37,7 +36,7 @@ _is_wireless() { [ -d /sys/class/net/"${IFACE}"/wireless ] && return 0 [ ! -e /proc/net/wireless ] && return 1 - grep -Eq "^[[:space:]]*${IFACE}:[[:space:]]+" /proc/net/wireless + grep -Eq "^[[:space:]]*${IFACE}:" /proc/net/wireless } _get_mac_address() { -- cgit v1.2.3