Update SLFO-1.2 branch

Additional fixes for PXE boot with filled-in NBFT (bsc#1238848): - fix(74nvmf): make sure autoconnect script is run at least once - fix(74nvmf): only set netroot if it's yet empty
2025-09-25 12:36:00 +02:00
9 changed files with 21 additions and 66 deletions
--- a/README.susemaint
+++ b/README.susemaint
@@ -11,10 +11,8 @@ branch. Currently, these active maintenance branches are:
 - SUSE/055              -> SLE 15 SP4
 - SLE-15-SP5_Update     -> SLE 15 SP5 (based on SUSE/055 plus some specific patches)
 - SLE-15-SP6_Update     -> SLE 15 SP6
- SLE-15-SP7_Update     -> SLE 15 SP7
 - SL-Micro-6.0_Update   -> SL Micro 6.0
 - SL-Micro-6.1_Update   -> SL Micro 6.1
- SLES-16.0_Update      -> SLES 16.0 and SL Micro 6.2 (both share the same code)
 - SLFO_Main             -> SUSE Linux Framework One
 - SUSE/059              -> Tumbleweed

@@ -137,7 +135,7 @@ MERGED  b2c6b584 fix(dracut.sh): exit if resolving executable dependencies fails
        d55fa823 ci: migrate from systemd-boot to systemd-utils in Gentoo container
        403f4e8e ci: do not run test container generation on forked repos by default
 MERGED  16855765 refactor(install): log about missing firmware only once
-MERGED  c46513fb test: increase test VM memory from 512M to 1024M to avoid OOM killer
+        c46513fb test: increase test VM memory from 512M to 1024M to avoid OOM killer
 MERGED  a804945f fix(integrity): do not require ls
        e278a965 ci: match comment with code
        9e1e9245 ci: automate release generation
@@ -202,7 +200,7 @@ MERGED  afb5717e fix(kernel-modules): add interconnect drivers
        d244b316 test(LVM-THIN): avoid thin pool size warning
        739b9e1b ci: cleanup containers
        ae7cd94b test: add empty default test_cleanup implementation
-MERGED  f1346763 test: move more common test code to test-functions
+        f1346763 test: move more common test code to test-functions
        5ac581ef fix(resolve-deps): check the existing file—not the source
 MERGED  07af8d58 fix(dracut-lib.sh): remove successful finished initqueue scripts
 MERGED  7310a641 fix(udev-rules): remove firmware.rules
@@ -213,7 +211,7 @@ MERGED  07b49a3e fix(virtiofs): add virtio_pci kernel module to virtiofs
        c08ae406 ci: install multipath-tools into openSuse container
        d1187543 test: remove references of dhcpd3 from tests
        1843c16c test: move test condition to test_check
-MERGED  006890a2 test: upgrade to ext4
+        006890a2 test: upgrade to ext4
 MERGED  86c8a5a7 fix(dracut-systemd): rootfs-generator cannot write outside of generator dir
 MERGED  acfa793b fix(dracut-systemd): check and create generator dir outside of inner function
 MERGED  a7c04716 fix(dracut-systemd): do not hardcode the systemd generator directory
@@ -410,12 +408,3 @@ da099c30 fix(rngd): adjust license to match the license of the whole project
 4f6ca33d fix(dracut-util): crash if CMDLINE ends with quotation mark
 1b11affd fix(74nvmf): only set netroot if it's yet empty
 f879b04d fix(74nvmf): make sure autoconnect script is run at least once
-614e9d34 fix(kernel-modules-extra): remove stray \ before /
-d464dcb8 test: switch to virtio for the QEMU drive
-2df41817 test: switch to virtio for the QEMU drive
-ef0972fe fix(systemd): move installation of libkmod to udev-rules module
-a6df84b7 test: make the size of all test drives 512 MB
-49a971b6 test(FULL SYSTEMD): no need to include dbus to the target rootfs
-412807b6 test(FULL-SYSTEMD): use poweroff to shut down test
-43648f08 test: move /failed to /run/failed as rootfs might be read-only
-bf29f4b7 fix(nfs): do not execute logic in nfs hooks if netroot is not nfs
--- a/2
+++ b/2
@@ -2,7 +2,7 @@
  <service name="obs_scm" mode="manual">
    <param name="scm">git</param>
    <param name="url">https://github.com/opensuse/dracut.git</param>
-    <param name="revision">SLFO_Main</param>
+    <param name="revision">SLES-16.0_Update</param>
    <param name="versionformat">@PARENT_TAG@+suse.@TAG_OFFSET@.g%h</param>
    <param name="extract">suse/dracut.spec</param>
    <param name="extract">suse/README.susemaint</param>
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                <param name="url">https://github.com/opensuse/dracut.git</param>
-              <param name="changesrevision">cbb1e9e9a5ecb9c22c85b142065762a02ad02846</param></service></servicedata>
+              <param name="changesrevision">40f7c5c4afb83854c276a56292e21aba11b4bedb</param></service></servicedata>
--- a/dracut-059+suse.700.g40f7c5c4.obscpio
+++ b/dracut-059+suse.700.g40f7c5c4.obscpio
--- a/dracut-059+suse.717.gcbb1e9e9.obscpio
+++ b/dracut-059+suse.717.gcbb1e9e9.obscpio
--- a/dracut.changes
+++ b/dracut.changes
@@ -1,39 +1,5 @@
 -------------------------------------------------------------------
-Mon Dec 29 15:16:39 UTC 2025 - antonio.feijoo@suse.com
-
- Update to version 059+suse.717.gcbb1e9e9:
-
-  Fix and update testsuite (bsc#1254873):
-  * test(FULL-SYSTEMD): ignore errors in systemd-vconsole-setup.service
-  * test: move /failed to /run/failed as rootfs might be read-only
-  * test(FULL-SYSTEMD): use poweroff to shut down test
-  * test(FULL SYSTEMD): no need to include dbus to the target rootfs
-  * test: make the size of all test drives 512 MB
-  * fix(systemd): move installation of libkmod to udev-rules module
-  * test: switch to virtio for the QEMU drive
-  * test: switch to virtio for the QEMU drive
-  * test: increase test VM memory from 512M to 1024M to avoid OOM killer
-  * test: move more common test code to test-functions
-  * test: upgrade to ext4
-
-  Other:
-  * fix(nfs): do not execute logic in nfs hooks if netroot is not nfs (bsc#1253960)
-
-------------------------------------------------------------------
-Thu Dec 18 07:56:55 UTC 2025 - Thomas Blume <thomas.blume@suse.com>
-
- fix packages for immutable mode (jsc#PED-14785)
-  * replace directory and files creation in specfile with tmpfiles
-    conf file dracut.conf
-
-------------------------------------------------------------------
-Fri Nov 28 12:57:44 UTC 2025 - antonio.feijoo@suse.com
-
- Update to version 059+suse.703.g3079f34f:
-  * fix(kernel-modules-extra): remove stray \ before / (bsc#1253029)
-
-------------------------------------------------------------------
-Tue Oct 21 12:50:57 UTC 2025 - antonio.feijoo@suse.com
+Thu Sep 25 10:26:23 UTC 2025 - antonio.feijoo@suse.com

 - Update to version 059+suse.700.g40f7c5c4:

--- a/dracut.conf
+++ b/dracut.conf
@@ -1,3 +0,0 @@
-D  /boot/dracut  - - - -
-D  /var/lib/dracut  - - - -
-D  /var/lib/dracut/overlay  - - - -
--- a/dracut.obsinfo
+++ b/dracut.obsinfo
@@ -1,4 +1,4 @@
 name: dracut
-version: 059+suse.717.gcbb1e9e9
-mtime: 1766764831
-commit: cbb1e9e9a5ecb9c22c85b142065762a02ad02846
+version: 059+suse.700.g40f7c5c4
+mtime: 1758287237
+commit: 40f7c5c4afb83854c276a56292e21aba11b4bedb
--- a/dracut.spec
+++ b/dracut.spec
@@ -24,7 +24,7 @@
 %endif

 Name:           dracut
-Version:        059+suse.717.gcbb1e9e9
+Version:        059+suse.700.g40f7c5c4
 Release:        0
 Summary:        Event driven initramfs infrastructure
 License:        GPLv2+ and LGPLv2+ and GPLv2
@@ -33,7 +33,6 @@ URL:            https://github.com/dracutdevs/dracut/wiki
 Source0:        dracut-%{version}.tar.xz
 Source1:        dracut-rpmlintrc
 Source2:        README.susemaint
-Source3:        dracut.conf
 BuildRequires:  asciidoc
 BuildRequires:  bash
 BuildRequires:  docbook-xsl-stylesheets
@@ -155,6 +154,11 @@ rm -rf %{buildroot}%{dracutlibdir}/modules.d/95znet
 rm -rf %{buildroot}%{dracutlibdir}/modules.d/00warpclock
 %endif

+mkdir -p %{buildroot}/boot/dracut
+mkdir -p %{buildroot}%{_localstatedir}/lib/dracut/overlay
+mkdir -p %{buildroot}%{_localstatedir}/log
+touch %{buildroot}%{_localstatedir}/log/dracut.log
+
 install -D -m 0644 dracut.conf.d/suse.conf.example %{buildroot}%{dracutlibdir}/dracut.conf.d/01-dist.conf
 install -m 0644 suse/99-debug.conf %{buildroot}%{_sysconfdir}/dracut.conf.d/99-debug.conf
 %ifnarch %ix86
@@ -167,9 +171,6 @@ install -m 0644 suse/s390x_persistent_policy.conf %{buildroot}%{_sysconfdir}/dra
 %else
 install -m 0644 suse/persistent_policy.conf %{buildroot}%{_sysconfdir}/dracut.conf.d/10-persistent_policy.conf
 %endif
-#switch to tmpfiles config
-mkdir -p %{buildroot}%{_tmpfilesdir}
-install -m 644 %{SOURCE3} %{buildroot}%{_tmpfilesdir}/dracut.conf

 %if 0%{?suse_version}
 rm -f %{buildroot}%{dracutlibdir}/modules.d/45ifcfg/write-ifcfg.sh
@@ -262,7 +263,9 @@ rm -f /var/adm/fillup-templates/sysconfig.kernel-mkinitrd
 %files tools
 %{_bindir}/dracut-catimages
 %{_mandir}/man8/dracut-catimages.8*
-%{_tmpfilesdir}/dracut.conf
+%dir /boot/dracut
+%dir %{_localstatedir}/lib/dracut
+%dir %{_localstatedir}/lib/dracut/overlay

 %files extra
 %license COPYING