network: factor out parse_ifname_opts() for ifname-genrules

diff --git a/modules.d/40network/ifname-genrules.sh b/modules.d/40network/ifname-genrules.sh
index e188c88be88acee4074c5f33d3500dd9151179ba..b0b429ccde253d031d81cd7d6a567daf7732fa62 100755 (executable)
--- a/modules.d/40network/ifname-genrules.sh
+++ b/modules.d/40network/ifname-genrules.sh
@@ -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

diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
index 9132e4d2e872105dab9ad64f14986057ab80bafe..9a1e00403a0fc53101fa28dba122707469b930fe 100644 (file)
--- a/modules.d/40network/net-lib.sh
+++ b/modules.d/40network/net-lib.sh
@@ -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
+}

diff --git a/modules.d/40network/parse-ifname.sh b/modules.d/40network/parse-ifname.sh
index ce73a72a360298ad6f1e54c9986109df7c3f88c2..d5156b370e4d24881188d3c6cf7a59bb7245ff1a 100755 (executable)
--- a/modules.d/40network/parse-ifname.sh
+++ b/modules.d/40network/parse-ifname.sh
@@ -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