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

add support for parsing newer ifconfig output

Browse Source 
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2008-04-19 07:22:30 +00:00
parent e96347523f
commit 18b4108755
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/ifconfig.sh.Linux.in
View File

@ -56,7 +56,7 @@ _set_flag()
_get_mac_address() _get_mac_address()
{ {
local mac=$(LC_ALL=C ifconfig "${IFACE}" | \ local mac=$(LC_ALL=C ifconfig "${IFACE}" | \
sed -n -e 's/.* HWaddr \(..:..:..:..:..:..\).*/\1/p') sed -n -e 's/.* \(HWaddr\|ether\) \(..:..:..:..:..:..\).*/\2/p')
case "${mac}" in case "${mac}" in
00:00:00:00:00:00);; 00:00:00:00:00:00);;
@ -77,7 +77,7 @@ _set_mac_address()
_get_inet_address() _get_inet_address()
{ {
set -- $(LC_ALL=C ifconfig "${IFACE}" | set -- $(LC_ALL=C ifconfig "${IFACE}" |
sed -n -e 's/.*inet addr:\([^ ]*\).*Mask:\([^ ]*\).*/\1 \2/p') sed -n -e 's/.*\(inet addr:\|inet \)\([^ ]*\).*\(Mask:\|netmask \)\([^ ]*\).*/\2 \4/p')
[ -z "$1" ] && return 1 [ -z "$1" ] && return 1
echo -n "$1" echo -n "$1"
@ -145,7 +145,7 @@ _add_address()
# IPv4 is tricky - ifconfig requires an aliased device # IPv4 is tricky - ifconfig requires an aliased device
# for multiple addresses # for multiple addresses
local iface="${IFACE}" local iface="${IFACE}"
if LC_ALL=C ifconfig "${iface}" | grep -Eq "\<inet addr:.*"; then if LC_ALL=C ifconfig "${iface}" | grep -Eq '\<inet (addr:)?.*'; then
# Get the last alias made for the interface and add 1 to it # Get the last alias made for the interface and add 1 to it
i=$(ifconfig | sed '1!G;h;$!d' | grep -m 1 -o "^${iface}:[0-9]*" \ i=$(ifconfig | sed '1!G;h;$!d' | grep -m 1 -o "^${iface}:[0-9]*" \
| sed -n -e 's/'"${iface}"'://p') | sed -n -e 's/'"${iface}"'://p')
@ -234,7 +234,7 @@ _delete_addresses()
# Remove IPv6 addresses # Remove IPv6 addresses
local addr= local addr=
for addr in $(LC_ALL=C ifconfig "${IFACE}" | \ for addr in $(LC_ALL=C ifconfig "${IFACE}" | \
sed -n -e 's/^.*inet6 addr: \([^ ]*\) Scope:[^L].*/\1/p'); do sed -n -e 's/^.*\(inet6 addr:\|inet6\) \([^ ]*\) .*\(Scope:[^L]\|scopeid [^<]*<[^l]\).*/\2/p'); do
[ "${addr}" = "::1/128" -a "${IFACE}" = "lo" ] && continue [ "${addr}" = "::1/128" -a "${IFACE}" = "lo" ] && continue
einfo "${addr}" einfo "${addr}"
ifconfig "${IFACE}" inet6 del "${addr}" ifconfig "${IFACE}" inet6 del "${addr}"