From 1b3563184907d74fc54a3ae6c0393d330c2a79fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Wed, 7 Oct 2020 15:09:59 +0200
Subject: [PATCH] - update scripts for
 https://fedoraproject.org/wiki/Changes/NetworkManager_keyfile_instead_of_ifcfg_rh

---
 ccw_init        | 17 ++++++++++++++++-
 device_cio_free |  8 ++++++++
 s390utils.spec  |  5 ++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/ccw_init b/ccw_init
index 23e8ed9..3703eaf 100644
--- a/ccw_init
+++ b/ccw_init
@@ -35,6 +35,14 @@ get_config_by_subchannel ()
         | LC_ALL=C sed -e "$__sed_discard_ignored_files"
 }
 
+get_config_by_subchannel_nm ()
+{
+    LANG=C grep -E -i -l \
+        "^s390-subchannels=([0-9]\.[0-9]\.[a-f0-9]+;){0,2}${1};([0-9]\.[0-9]\.[a-f0-9]+;){0,2}$" \
+        /etc/NetworkManager/system-connections/*.nmconnection \
+        | LC_ALL=C sed -e "$__sed_discard_ignored_files"
+}
+
 CHANNEL=${DEVPATH##*/}
 
 if [ $MODE = "dracut" ]; then
@@ -65,7 +73,14 @@ elif [ $MODE = "normal" ]; then
     if [ -n "$CONFIG_FILE" ]; then
 	. $CONFIG_FILE
     else
-	exit 1
+	CONFIG_FILE=$(get_config_by_subchannel_nm $CHANNEL)
+	if [ -n "$CONFIG_FILE" ]; then
+	    NETTYPE=$(sed -nr "/^\[ethernet\]/ { :l /^s390-nettype[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" $CONFIG_FILE)
+	    SUBCHANNELS=$(sed -nr "/^\[ethernet\]/ { :l /^s390-subchannels[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" $CONFIG_FILE | sed -e "s/;/,/g" -e "s/,$//")
+	    LAYER2=$(sed -nr "/^\[ethernet-s390-options\]/ { :l /^layer2[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" $CONFIG_FILE)
+	else
+	    exit 1
+	fi
     fi
 else
     echo "Unknown mode=$MODE"
diff --git a/device_cio_free b/device_cio_free
index cd2b21f..cfdced0 100644
--- a/device_cio_free
+++ b/device_cio_free
@@ -306,6 +306,14 @@ if [ $MODE_ZNET ]; then
 	eval "$line"
         free_device $SUBCHANNELS
     done
+    for line in $(LANG=C grep -E -i -h \
+	"^s390-subchannels=([0-9]\.[0-9]\.[a-f0-9]+;){2,3}$" \
+	$( (ls /etc/NetworkManager/system-connections/*.nmconnection 2> /dev/null ||  echo "__no_config_file") | \
+        LC_ALL=C sed -e "$__sed_discard_ignored_files") 2> /dev/null)
+    do
+	SUBCHANNELS="$(echo $line | sed -e "s/s390-subchannels=//" -e "s/;/,/g")"
+        free_device $SUBCHANNELS
+    done
 fi
 
 [ -z "$ALL_DEVICES" ] && exit 0
diff --git a/s390utils.spec b/s390utils.spec
index 62c68c4..72fb070 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -6,7 +6,7 @@
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
 Version:        2.14.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          2
 License:        MIT
 ExclusiveArch:  s390 s390x
@@ -792,6 +792,9 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Wed Oct 07 2020 Dan Horák <dan[at]danny.cz> - 2:2.14.0-4
+- update scripts for https://fedoraproject.org/wiki/Changes/NetworkManager_keyfile_instead_of_ifcfg_rh
+
 * Mon Sep 21 2020 Dan Horák <dan[at]danny.cz> - 2:2.14.0-3
 - rebuilt for net-snmp 5.9