Accepting request 959393 from home:favogt:combustion

- Add support for NetworkManager in dracut:
  * ignition-enable-network.service, ignition-enable-network.sh

OBS-URL: https://build.opensuse.org/request/show/959393
OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=83

ignition-enable-network.service

@@ -15,7 +15,7 @@ Before=ignition-fetch.service
 # See hack in coreos-enable-network, as well as coreos-copy-firstboot-network.service;
 # adapted for SUSE / wicked use
 After=dracut-cmdline.service
-Before=dracut-initqueue.service
+Before=dracut-initqueue.service nm-initrd.service
 
 [Service]
 Type=oneshot

ignition-enable-network.sh

@@ -5,8 +5,14 @@
 if [ -f /run/ignition/neednet ] && ! getargbool 0 'rd.neednet'; then
     echo "rd.neednet=1" > /etc/cmdline.d/40-ignition-neednet.conf
 
-    # Re-trigger generation of network rules
-    . /lib/dracut/hooks/pre-udev/60-net-genrules.sh
-    udevadm control --reload
-    udevadm trigger --subsystem-match net --action add
+    # Re-trigger generation of network rules and apply them
+    if [ -e /lib/dracut/hooks/pre-udev/60-net-genrules.sh ]; then
+        # Wicked
+        . /lib/dracut/hooks/pre-udev/60-net-genrules.sh
+        udevadm control --reload
+        udevadm trigger --subsystem-match net --action add
+    else
+        # NetworkManager
+        . /usr/lib/dracut/hooks/cmdline/99-nm-config.sh
+    fi
 fi

ignition.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar  4 10:23:10 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- Add support for NetworkManager in dracut:
+  * ignition-enable-network.service, ignition-enable-network.sh
+
 -------------------------------------------------------------------
 Wed Dec 01 09:36:14 UTC 2021 - iforster@suse.com
 

ignition.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ignition
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed