From e95e48c6eee46ea0d3cbaa9e28576f795204018a Mon Sep 17 00:00:00 2001

From: Harald Hoyer <harald@redhat.com>

Date: Thu, 30 Jan 2014 17:11:43 +0100

Subject: [PATCH] network/net-lib.sh: parse ibft nameserver settings

---

 modules.d/40network/net-lib.sh | 5 ++++-

 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh

index 36fad12..1b51c85 100755

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

+++ b/modules.d/40network/net-lib.sh

@@ -185,6 +185,7 @@ ibft_to_cmdline() {

         for iface in /sys/firmware/ibft/ethernet*; do

             local mac="" dev=""

             local dhcp="" ip="" gw="" mask="" hostname=""

+            local dns1 dns2

             [ -e ${iface}/mac ] || continue

             mac=$(read a < ${iface}/mac; echo $a)

@@ -203,9 +204,11 @@ ibft_to_cmdline() {

                 [ "$ip" = "0.0.0.0" ] && continue

                 [ -e ${iface}/gateway ] && gw=$(read a < ${iface}/gateway; echo $a)

                 [ -e ${iface}/subnet-mask ] && mask=$(read a < ${iface}/subnet-mask; echo $a)

+                [ -e ${iface}/primary-dns ] && dns1=$(read a < ${iface}/primary-dns; echo $a)

+                [ -e ${iface}/secondary-dns ] && dns2=$(read a < ${iface}/secondary-dns; echo $a)

                 [ -e ${iface}/hostname ] && hostname=$(read a < ${iface}/hostname; echo $a)

                 if [ -n "$ip" ] && [ -n "$mask" ]; then

-                    echo "ip=$ip::$gw:$mask:$hostname:$dev:none"

+                    echo "ip=$ip::$gw:$mask:$hostname:$dev:none${dns1:+:$dns1}${dns2:+:$dns2}"

                 else

                     warn "${iface} does not contain a valid iBFT configuration"

                     warn "ip-addr=$ip"