Don't search for a space after interface names in /proc/net, #174792 thanks to Mike Auty.
This commit is contained in:
parent
74527291b5
commit
757b8bcc96
@ -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 <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>:
|
||||
|
||||
Fix module loading, #174360.
|
||||
|
@ -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() {
|
||||
|
@ -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() {
|
||||
|
Loading…
Reference in New Issue
Block a user