[PATCH 1/2] Change the way the networking information is obtained in linuxrc.s390

[David Cantrell <dcantrell@xxxxxxxxxx>]

I was working with a tree that was a few weeks old and dracut changed
enough that my approach needed to change.

Related: rhbz#783227
---
 loader/linuxrc.s390 |   50 ++++++++++++++++++++++++++++++--------------------
 1 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390
index 725d7da..e67d01a 100644
--- a/loader/linuxrc.s390
+++ b/loader/linuxrc.s390
@@ -159,34 +159,44 @@ function startinetd()
 
     /usr/sbin/sshd -f /etc/ssh/sshd_config.anaconda
 
-    # XXX: there may be better files to rely on, also errors may mean something
-    iface="$(cat /run/initramfs/net.bootdev 2>/dev/null)"
-    if [ ! -z "${iface}" ]; then
-        . /run/initramfs/net.${iface}.override 2>/dev/null
-    fi
+    N=/sys/class/net
+    if [ -d ${N} ]; then
+        # get the IP address used during installation
+        devcount="$(ls -1 ${N} 2>/dev/null | grep -v lo | wc -l)"
+
+        if [ ${devcount} -ne 1 ]; then
+            echo >&2
+            echo "ERROR: You may only have one Ethernet device configured during installation." >&2
+            echo >&2
+            exit 1
+        fi
 
-    # copy dracut ifcfg files to keep NetworkManager from downing them all
-    DRACUTDIR=/run/initramfs/state
-    IFCFGDIR=/etc/sysconfig/network-scripts
-    if [ -d ${DRACUTDIR}${IFCFGDIR} ]; then
-        mkdir -p ${IFCFGDIR}
-        ls -1 ${DRACUTDIR}${IFCFGDIR}/ifcfg-* 2>/dev/null | while read ifcfgfile ; do
-            baseifcfg="$(basename ${ifcfgfile})"
-            cp ${ifcfgfile} ${IFCFGDIR}
-            echo "NM_CONTROLLED=no" >> ${IFCFGDIR}/${baseifcfg}
+        IPADDR="$(ifconfig eth0 | grep 'inet addr:' | cut -d ':' -f 2 | cut -d ' ' -f 1)"
+
+        # keep NetworkManager from downing all configured interfaces
+        IFCFGDIR=/etc/sysconfig/network-scripts
+        [ ! -d ${IFCFGDIR} ] && mkdir -p ${IFCFGDIR}
+        cd ${N}
+        for dev in * ; do
+            C=${IFCFGDIR}/ifcfg-${dev}
+            echo "DEVICE=${dev}" > ${C}
+            echo "BOOTPROTO=static" >> ${C}
+            echo "HWADDR=$(cat ${dev}/address | tr [a-f] [A-F])" >> ${C}
+            echo "NM_CONTROLLED=no" >> ${C}
+            echo "ONBOOT=yes" >> ${C}
         done
     fi
 
     # make sure we have a resolv.conf
-    DRACUTRESOLV="$(ls -1 /run/initramfs/state/etc/*.resolv.conf 2>/dev/null)"
-    if [ -r ${DRACUTRESOLV} ]; then
-        cp ${DRACUTRESOLV} /etc/resolv.conf
-    fi
+    for bootopt in $(cat /proc/cmdline) ; do
+        echo "${bootopt}" | grep -q -E "^nameserver=" 2>/dev/null
+        [ $? -eq 0 ] && echo ${bootopt} | tr '=' ' '
+    done > /etc/resolv.conf
 
     if [ -z "$RUNKS" ]; then
         echo
-        echo $"Connect now to $ip and log in as user 'install' to start the installation."
-        echo $"E.g. using: ssh -x install@$ip"
+        echo $"Connect now to $IPADDR and log in as user 'install' to start the installation."
+        echo $"E.g. using: ssh -x install@$IPADDR"
         echo $"For VNC or text mode, disable X11 forwarding (recommended) with 'ssh -x'."
         echo $"For X11, enable X11 forwarding with 'ssh -X'."
         echo
-- 
1.7.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list