Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package combustion for openSUSE:Factory 
checked in at 2022-03-07 17:45:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/combustion (Old)
 and      /work/SRC/openSUSE:Factory/.combustion.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "combustion"

Mon Mar  7 17:45:34 2022 rev:13 rq:959827 version:0.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/combustion/combustion.changes    2021-11-24 
23:54:57.900379830 +0100
+++ /work/SRC/openSUSE:Factory/.combustion.new.1958/combustion.changes  
2022-03-07 17:45:35.855143123 +0100
@@ -1,0 +2,10 @@
+Thu Mar  3 11:58:07 UTC 2022 - Fabian Vogt <fv...@suse.com>
+
+- Support the dracut network-manager module
+
+-------------------------------------------------------------------
+Mon Jan 24 11:44:57 UTC 2022 - Fabian Vogt <fv...@suse.com>
+
+- Remove /var/lib/YaST2/reconfig_system on successful runs
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ combustion.spec ++++++
--- /var/tmp/diff_new_pack.BrXOeJ/_old  2022-03-07 17:45:38.447142374 +0100
+++ /var/tmp/diff_new_pack.BrXOeJ/_new  2022-03-07 17:45:38.451142373 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package combustion
 #
-# 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

++++++ combustion ++++++
--- /var/tmp/diff_new_pack.BrXOeJ/_old  2022-03-07 17:45:38.515142354 +0100
+++ /var/tmp/diff_new_pack.BrXOeJ/_new  2022-03-07 17:45:38.519142353 +0100
@@ -47,12 +47,19 @@
           && grep -qE '^# combustion:(.*)\<network\>' 
"${config_mount}/combustion/script"; then
                sh -s <<EOF
                        . /lib/dracut-lib.sh
+                       # Set rd.neednet if not already done and reevaluate it 
(module-specific)
                        getargbool 0 'rd.neednet' && exit 0
                        echo rd.neednet=1  > 
/etc/cmdline.d/40-combustion-neednet.conf
-                       # Re-trigger generation of network rules and apply them
-                       . /lib/dracut/hooks/pre-udev/60-net-genrules.sh
-                       udevadm control --reload
-                       udevadm trigger --subsystem-match net --action add
+                       if [ -e /lib/dracut/hooks/pre-udev/60-net-genrules.sh 
]; then
+                               # Wicked
+                               . /lib/dracut/hooks/pre-udev/60-net-genrules.sh
+                               # Re-trigger generation of network rules and 
apply them
+                               udevadm control --reload
+                               udevadm trigger --subsystem-match net --action 
add
+                       else
+                               # NetworkManager
+                               . /usr/lib/dracut/hooks/cmdline/99-nm-config.sh
+                       fi
 EOF
        fi
 
@@ -180,5 +187,7 @@
        chroot /sysroot snapper --no-dbus create -d "After combustion 
configuration" || :
 fi
 
+rm -f /sysroot/var/lib/YaST2/reconfig_system
+
 exit 0
 

++++++ combustion-prepare.service ++++++
--- /var/tmp/diff_new_pack.BrXOeJ/_old  2022-03-07 17:45:38.539142347 +0100
+++ /var/tmp/diff_new_pack.BrXOeJ/_new  2022-03-07 17:45:38.543142346 +0100
@@ -16,8 +16,9 @@
 # device
 After=ignition-setup-user.service
 
-# This reconfigures networking, which runs during the initqueue
-Before=dracut-initqueue.service
+# This reconfigures networking, which runs during the initqueue (wicked)
+# or has its own service (NM)
+Before=dracut-initqueue.service nm-initrd.service
 
 Conflicts=initrd-switch-root.target umount.target
 Conflicts=dracut-emergency.service emergency.service emergency.target

Reply via email to