Browse Source

network: factor out parse_ifname_opts() for ifname-genrules

master
Harald Hoyer 13 years ago
parent
commit
e7dc1e42cd
  1. 2
      modules.d/40network/ifname-genrules.sh
  2. 16
      modules.d/40network/net-lib.sh
  3. 16
      modules.d/40network/parse-ifname.sh

2
modules.d/40network/ifname-genrules.sh

@ -7,6 +7,8 @@ if ! getarg ifname= >/dev/null ; then @@ -7,6 +7,8 @@ if ! getarg ifname= >/dev/null ; then
return
fi

command -v parse_ifname_opts >/dev/null || . /lib/net-lib.sh

{
for p in $(getargs ifname=); do
parse_ifname_opts $p

16
modules.d/40network/net-lib.sh

@ -289,3 +289,19 @@ ip_to_var() { @@ -289,3 +289,19 @@ ip_to_var() {
esac
fi
}

parse_ifname_opts() {
local IFS=:
set $1

case $# in
7)
ifname_if=$1
# udev requires MAC addresses to be lower case
ifname_mac=$(echo $2:$3:$4:$5:$6:$7 | sed 'y/ABCDEF/abcdef/')
;;
*)
die "Invalid arguments for ifname="
;;
esac
}

16
modules.d/40network/parse-ifname.sh

@ -18,21 +18,7 @@ if ! getarg ifname= >/dev/null ; then @@ -18,21 +18,7 @@ if ! getarg ifname= >/dev/null ; then
return
fi

parse_ifname_opts() {
local IFS=:
set $1

case $# in
7)
ifname_if=$1
# udev requires MAC addresses to be lower case
ifname_mac=$(echo $2:$3:$4:$5:$6:$7 | sed 'y/ABCDEF/abcdef/')
;;
*)
die "Invalid arguments for ifname="
;;
esac
}
command -v parse_ifname_opts >/dev/null || . /lib/net-lib.sh

# Check ifname= lines
for p in $(getargs ifname=); do

Loading…
Cancel
Save