From 0380ded4861baade8ec2165f101f733c20662f9e Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Fri, 20 Oct 2023 09:44:22 +0200
Subject: [PATCH] fix(network): correct network device naming (bsc#1192986)

Make the rule for persistent net device naming default in SLES.
Keep the predictable names as fallback if 70-persistent-net.rules is not
present but a network module is added to the initrd.
Make sure that either persistent or predictable naming is applied, but never
both.
---
 modules.d/35network-legacy/module-setup.sh  |  6 ++++--
 modules.d/35network-manager/module-setup.sh |  9 ++++++---
 modules.d/95udev-rules/module-setup.sh      | 19 ++++++++++++++++---
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/modules.d/35network-legacy/module-setup.sh b/modules.d/35network-legacy/module-setup.sh
index fa22a6ebbc..7a87055ba6 100755
--- a/modules.d/35network-legacy/module-setup.sh
+++ b/modules.d/35network-legacy/module-setup.sh
@@ -26,8 +26,10 @@ installkernel() {
 install() {
     local _arch
 
-    #Adding default link
-    if dracut_module_included "systemd"; then
+    # Add default link if there is no persistent network device naming
+    if [ ! -e /etc/udev/rules.d/70-persistent-net.rules ] &&\
+         dracut_module_included "systemd"; then
+
         inst_multiple -o "${systemdnetwork}/99-default.link"
         [[ $hostonly ]] && inst_multiple -H -o "${systemdnetworkconfdir}/*.link"
     fi
diff --git a/modules.d/35network-manager/module-setup.sh b/modules.d/35network-manager/module-setup.sh
index d9a244a3f0..4d17cd8e4d 100755
--- a/modules.d/35network-manager/module-setup.sh
+++ b/modules.d/35network-manager/module-setup.sh
@@ -51,9 +51,12 @@ install() {
         inst_simple "$moddir"/nm-initrd.service "$systemdsystemunitdir"/nm-initrd.service
         inst_simple "$moddir"/nm-wait-online-initrd.service "$systemdsystemunitdir"/nm-wait-online-initrd.service
 
-        # Adding default link
-        inst_multiple -o "${systemdnetwork}/99-default.link"
-        [[ $hostonly ]] && inst_multiple -H -o "${systemdnetworkconfdir}/*.link"
+        # Add default link if there is no persistent network device naming
+        if [ ! -e /etc/udev/rules.d/70-persistent-net.rules ]; then
+
+            inst_multiple -o "${systemdnetwork}/99-default.link"
+            [[ $hostonly ]] && inst_multiple -H -o "${systemdnetworkconfdir}/*.link"
+        fi
 
         $SYSTEMCTL -q --root "$initdir" enable nm-initrd.service
     fi
diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
index 6b46604e72..250c60fc93 100755
--- a/modules.d/95udev-rules/module-setup.sh
+++ b/modules.d/95udev-rules/module-setup.sh
@@ -35,9 +35,9 @@ install() {
         60-cdrom_id.rules \
         60-pcmcia.rules \
         60-persistent-storage.rules \
+        61-persistent-storage-edd.rules \
         64-btrfs.rules \
         70-uaccess.rules \
-        70-persistent-net.rules \
         71-seat.rules \
         73-seat-late.rules \
         75-net-description.rules \
@@ -47,8 +47,21 @@ install() {
         "$moddir/61-persistent-storage.rules"
 
     prepare_udev_rules 59-persistent-storage.rules 61-persistent-storage.rules
-    # legacy persistent network device name rules
-    [[ $hostonly ]] && inst_rules 70-persistent-net.rules
+
+    # debian udev rules
+    inst_rules 91-permissions.rules
+    # eudev rules
+    inst_rules 80-drivers-modprobe.rules
+
+    # only include persistent network device name rules if network is set up
+    # in the initrd
+    # Avoid interference with systemd predictable network device naming
+    if dracut_module_included "network-legacy" || dracut_module_included "network-manager"; then
+        if [ -e /etc/udev/rules.d/70-persistent-net.rules ] && \
+           ! dracut_module_included "systemd-networkd"; then
+               [[ $hostonly ]] && inst_rules 70-persistent-net.rules
+        fi
+    fi
 
     {
         for i in cdrom tape dialout floppy; do