diff --git a/README.susemaint b/README.susemaint
index 149787c..5c2314e 100644
--- a/README.susemaint
+++ b/README.susemaint
@@ -6,11 +6,13 @@ Maintaining dracut
Patches are added as merge requests on GitHub against the respective maintenance
branch. Currently, these active maintenance branches are:
-- SUSE/044 -> SLE 12 SP5
-- SUSE/049 -> SLE 15 SP2, SLE 15 SP3
-- SUSE/055 -> SLE 15 SP4
-- SLE-15-SP5_Update -> SLE 15 SP5 (based on SUSE/055 plus some specific patches)
-- SUSE/059 -> Tumbleweed
+- SUSE/044 -> SLE 12 SP5
+- SUSE/049 -> SLE 15 SP2, SLE 15 SP3
+- 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
+- SL-Micro-6.0_Update -> SL Micro 6.0
+- SUSE/059 -> Tumbleweed
Rules:
@@ -353,4 +355,22 @@ were already merged
a45048b8 fix(dracut): move hooks directory from /usr/lib to /var/lib
424717af fix: /etc/modprobe.d --> /run/modprobe.d (partially reverted)
4cc962aa fix(systemd-ask-password): no graphical output in aarch64
+6c55657e refactor(cms): use zdev to simplify handling CMSDASD=... boot option
+53a5d10b refactor(cms): use consolidated zfcp config with zdev from s390-tools
+168c0c66 refactor(cms): use consolidated dasd config with zdev from s390-tools
+0b6d6952 refactor(cms): use consolidated network config with zdev from s390-tools
+166e8a22 refactor(cms): remove now unnecessary inclusion of full s390utils-base
+b5a35f9d feat(zfcp_rules): remove zfcp handling consolidated in s390-tools
+7745a81a feat(zfcp): minimize zfcp handling consolidated in s390-tools
+72c945ca feat(dasd_rules): remove dasd handling consolidated in s390-tools
+2397c479 feat(dasd_mod): minimize dasd handling consolidated in s390-tools
+36e1f884 feat(dasd): minimize dasd handling consolidated in s390-tools
+658a21ac feat(znet): use zdev for consolidated device configuration
+8707a69b docs(dracut.cmdline): generalize description of rd.znet
+198a86c2 feat(qeth_rules): remove qeth handling consolidated in 95znet
+22f51730 fix(znet): append to udev rules so each rd.znet_ifname is effective
+2d8fa8be refactor(ifcfg): delete code duplication using iface_get_subchannels()
+457e66e6 feat(ifcfg): minimize s390-specific network configuration aspects
+3fd43858 fix(mdraid): try to assemble the missing raid device
+61ab3386 feat(crypt): force the inclusion of crypttab entries with x-initrd.attach
diff --git a/_servicedata b/_servicedata
index e2f0c23..7d794a8 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/opensuse/dracut.git
- fe80dac7f926d36c7aa2c5d88c2db71f38b24a07
\ No newline at end of file
+ ff12ca6328178bbd94018b05958eddc4e0676daa
\ No newline at end of file
diff --git a/dracut-059+suse.598.gfe80dac7.obscpio b/dracut-059+suse.598.gfe80dac7.obscpio
deleted file mode 100644
index 69632ac..0000000
--- a/dracut-059+suse.598.gfe80dac7.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4b1bbb1de2403ed86239fe88480d69bd2a701939edc0d092368ad7e7b401379a
-size 2132492
diff --git a/dracut-059+suse.628.g20b345b4.obscpio b/dracut-059+suse.628.g20b345b4.obscpio
new file mode 100644
index 0000000..072a0be
--- /dev/null
+++ b/dracut-059+suse.628.g20b345b4.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3761a0e63070a785930999f32efdd939029c182747db8a75217f21d54383f44e
+size 2124812
diff --git a/dracut.changes b/dracut.changes
index f5bec33..2e9315d 100644
--- a/dracut.changes
+++ b/dracut.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Tue Jul 02 11:34:22 UTC 2024 - antonio.feijoo@suse.com
+
+- Update to version 059+suse.628.g20b345b4:
+ * feat(crypt): force the inclusion of crypttab entries with x-initrd.attach (bsc#1226529)
+ * fix(mdraid): try to assemble the missing raid device (bsc#1226412)
+ * feat(ifcfg): minimize s390-specific network configuration aspects
+ * refactor(ifcfg): delete code duplication using iface_get_subchannels()
+ * fix(znet): append to udev rules so each rd.znet_ifname is effective
+ * feat(qeth_rules): remove qeth handling consolidated in 95znet
+ * docs(dracut.cmdline): generalize description of rd.znet
+ * feat(znet): use zdev for consolidated device configuration
+ * feat(dasd): minimize dasd handling consolidated in s390-tools
+ * feat(dasd_mod): minimize dasd handling consolidated in s390-tools
+ * feat(dasd_rules): remove dasd handling consolidated in s390-tools
+ * feat(zfcp): minimize zfcp handling consolidated in s390-tools
+ * feat(zfcp_rules): remove zfcp handling consolidated in s390-tools
+ * refactor(cms): remove now unnecessary inclusion of full s390utils-base
+ * refactor(cms): use consolidated network config with zdev from s390-tools
+ * refactor(cms): use consolidated dasd config with zdev from s390-tools
+ * refactor(cms): use consolidated zfcp config with zdev from s390-tools
+ * refactor(cms): use zdev to simplify handling CMSDASD=... boot option
+ * fix(dracut-install): continue parsing if ldd prints "cannot be preloaded" (bsc#1208690)
+
-------------------------------------------------------------------
Mon May 27 12:09:20 UTC 2024 - antonio.feijoo@suse.com
diff --git a/dracut.obsinfo b/dracut.obsinfo
index 3682799..2d4721f 100644
--- a/dracut.obsinfo
+++ b/dracut.obsinfo
@@ -1,4 +1,4 @@
name: dracut
-version: 059+suse.598.gfe80dac7
-mtime: 1716811691
-commit: fe80dac7f926d36c7aa2c5d88c2db71f38b24a07
+version: 059+suse.628.g20b345b4
+mtime: 1719919766
+commit: 20b345b4e1bcaf1ea71cc67263b13cb4d8e85577
diff --git a/dracut.spec b/dracut.spec
index f56f783..c3c7003 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -25,7 +25,7 @@
%endif
Name: dracut
-Version: 059+suse.598.gfe80dac7
+Version: 059+suse.628.g20b345b4
Release: 0
Summary: Event driven initramfs infrastructure
License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -147,11 +147,8 @@ rm -rf %{buildroot}%{dracutlibdir}/modules.d/81cio_ignore
rm -rf %{buildroot}%{dracutlibdir}/modules.d/91zipl
rm -rf %{buildroot}%{dracutlibdir}/modules.d/95dasd
rm -rf %{buildroot}%{dracutlibdir}/modules.d/95dasd_mod
-rm -rf %{buildroot}%{dracutlibdir}/modules.d/95dasd_rules
rm -rf %{buildroot}%{dracutlibdir}/modules.d/95dcssblk
-rm -rf %{buildroot}%{dracutlibdir}/modules.d/95qeth_rules
rm -rf %{buildroot}%{dracutlibdir}/modules.d/95zfcp
-rm -rf %{buildroot}%{dracutlibdir}/modules.d/95zfcp_rules
rm -rf %{buildroot}%{dracutlibdir}/modules.d/95znet
%else
rm -rf %{buildroot}%{dracutlibdir}/modules.d/00warpclock
@@ -434,7 +431,6 @@ rm -f /var/adm/fillup-templates/sysconfig.kernel-mkinitrd
%{dracutlibdir}/modules.d/95cifs
%ifarch s390 s390x
%{dracutlibdir}/modules.d/95dasd_mod
-%{dracutlibdir}/modules.d/95dasd_rules
%{dracutlibdir}/modules.d/95dcssblk
%endif
%{dracutlibdir}/modules.d/95debug
@@ -446,9 +442,6 @@ rm -f /var/adm/fillup-templates/sysconfig.kernel-mkinitrd
%{dracutlibdir}/modules.d/95nbd
%{dracutlibdir}/modules.d/95nfs
%{dracutlibdir}/modules.d/95nvmf
-%ifarch s390 s390x
-%{dracutlibdir}/modules.d/95qeth_rules
-%endif
%{dracutlibdir}/modules.d/95resume
%{dracutlibdir}/modules.d/95rootfs-block
%{dracutlibdir}/modules.d/95ssh-client
@@ -456,9 +449,6 @@ rm -f /var/adm/fillup-templates/sysconfig.kernel-mkinitrd
%{dracutlibdir}/modules.d/95udev-rules
%{dracutlibdir}/modules.d/95virtfs
%{dracutlibdir}/modules.d/95virtiofs
-%ifarch s390 s390x
-%{dracutlibdir}/modules.d/95zfcp_rules
-%endif
%{dracutlibdir}/modules.d/97biosdevname
%ifarch %ix86
%exclude %{dracutlibdir}/modules.d/96securityfs