From: Will Woods <wwoods@redhat.com>
Date: Wed, 22 Aug 2012 16:57:43 +0000 (-0400)
Subject: move fix_bootif to net-lib
X-Git-Tag: 029~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=215ff169dbf01c6175840c8e69d50b9b960dc1a7;p=thirdparty%2Fdracut.git

move fix_bootif to net-lib

This might be useful to other parts of dracut; move it to net-lib.sh.
---

diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
index 8f28c93ea..f4b1f88c0 100755
--- a/modules.d/40network/net-genrules.sh
+++ b/modules.d/40network/net-genrules.sh
@@ -2,18 +2,6 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
-# pxelinux provides macaddr '-' separated, but we need ':'
-fix_bootif() {
-    local macaddr=${1}
-    local IFS='-'
-    macaddr=$(for i in ${macaddr} ; do echo -n $i:; done)
-    macaddr=${macaddr%:}
-    # strip hardware type field from pxelinux
-    [ -n "${macaddr%??:??:??:??:??:??}" ] && macaddr=${macaddr#??:}
-    # return macaddr with lowercase alpha characters expected by udev
-    echo $macaddr | sed 'y/ABCDEF/abcdef/'
-}
-
 getargbool 0 rd.neednet && NEEDNET=1
 
 # Don't continue if we don't need network
@@ -21,6 +9,8 @@ if [ -z "$netroot" ] && [ ! -e "/tmp/net.ifaces" ] && [ "$NEEDNET" != "1" ]; the
     return
 fi
 
+command -v fix_bootif >/dev/null || . /lib/net-lib.sh
+
 # Write udev rules
 {
     # bridge: attempt only the defined interface
diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
index f8288bbfe..056fbc924 100644
--- a/modules.d/40network/net-lib.sh
+++ b/modules.d/40network/net-lib.sh
@@ -139,6 +139,18 @@ set_ifname() {
     echo "$name$num"
 }
 
+# pxelinux provides macaddr '-' separated, but we need ':'
+fix_bootif() {
+    local macaddr=${1}
+    local IFS='-'
+    macaddr=$(for i in ${macaddr} ; do echo -n $i:; done)
+    macaddr=${macaddr%:}
+    # strip hardware type field from pxelinux
+    [ -n "${macaddr%??:??:??:??:??:??}" ] && macaddr=${macaddr#??:}
+    # return macaddr with lowercase alpha characters expected by udev
+    echo $macaddr | sed 'y/ABCDEF/abcdef/'
+}
+
 ibft_to_cmdline() {
     local iface="" mac="" dev=""
     local dhcp="" ip="" gw="" mask="" hostname=""