emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't search for a space after interface names in /proc/net, #174792 thanks to Mike Auty.

Browse Source
This commit is contained in:
Roy Marples 2007-04-16 12:56:43 +00:00
parent 74527291b5
commit 757b8bcc96
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,6 +1,11 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts # ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2
16 Apr 2007; Roy Marples <uberlord@gentoo.org>:
Don't search for a space after interface names in /proc/net, #174792
thanks to Mike Auty.
13 Apr 2007; Roy Marples <uberlord@gentoo.org>: 13 Apr 2007; Roy Marples <uberlord@gentoo.org>:
Fix module loading, #174360. Fix module loading, #174360.

6
net.Linux/ifconfig.sh
View File

@ -15,7 +15,7 @@ _down() {
} }
_exists() { _exists() {
grep -Eq "^[[:space:]]*${IFACE}:[[:space:]]*" /proc/net/dev grep -Eq "^[[:space:]]*${IFACE}:" /proc/net/dev
} }
_ifindex() { _ifindex() {
@ -24,7 +24,7 @@ _ifindex() {
i=$((${i} + 1)) i=$((${i} + 1))
[ ${i} -lt 1 ] && continue [ ${i} -lt 1 ] && continue
case "${line}" in case "${line}" in
"${IFACE}: "*) echo "${i}"; return 0;; "${IFACE}:"*) echo "${i}"; return 0;;
esac esac
done < /proc/net/dev done < /proc/net/dev
return 1 return 1
@ -35,7 +35,7 @@ _is_wireless() {
[ -d /sys/class/net/"${IFACE}"/wireless ] && return 0 [ -d /sys/class/net/"${IFACE}"/wireless ] && return 0
[ ! -e /proc/net/wireless ] && return 1 [ ! -e /proc/net/wireless ] && return 1
grep -Eq "^[[:space:]]*${IFACE}:[[:space:]]+" /proc/net/wireless grep -Eq "^[[:space:]]*${IFACE}:" /proc/net/wireless
} }
_get_mac_address() { _get_mac_address() {

7
net.Linux/iproute2.sh
View File

@ -7,7 +7,6 @@ iproute2_depend() {
after ifconfig after ifconfig
} }
_up() { _up() {
ip link set up dev "${IFACE}" ip link set up dev "${IFACE}"
} }
@ -17,7 +16,7 @@ _down() {
} }
_exists() { _exists() {
grep -Eq "^[[:space:]]*${IFACE}:[[:space:]]*" /proc/net/dev grep -Eq "^[[:space:]]*${IFACE}:" /proc/net/dev
} }
_ifindex() { _ifindex() {
@ -26,7 +25,7 @@ _ifindex() {
i=$((${i} + 1)) i=$((${i} + 1))
[ ${i} -lt 1 ] && continue [ ${i} -lt 1 ] && continue
case "${line}" in case "${line}" in
"${IFACE}: "*) echo "${i}"; return 0;; "${IFACE}:"*) echo "${i}"; return 0;;
esac esac
done < /proc/net/dev done < /proc/net/dev
return 1 return 1
@ -37,7 +36,7 @@ _is_wireless() {
[ -d /sys/class/net/"${IFACE}"/wireless ] && return 0 [ -d /sys/class/net/"${IFACE}"/wireless ] && return 0
[ ! -e /proc/net/wireless ] && return 1 [ ! -e /proc/net/wireless ] && return 1
grep -Eq "^[[:space:]]*${IFACE}:[[:space:]]+" /proc/net/wireless grep -Eq "^[[:space:]]*${IFACE}:" /proc/net/wireless
} }
_get_mac_address() { _get_mac_address() {