Accepting request 504692 from Base:System

- Suppress nonsensical error message (bsc#1032029)
  adds 0524-Suppress-nonsensical-error-message-bsc-1032029.patch (forwarded request 504691 from dmolkentin)

OBS-URL: https://build.opensuse.org/request/show/504692
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dracut?expand=0&rev=109

0521-Ensure-udev-persistent-storage-compat-rules-get-crea.patch

@@ -0,0 +1,29 @@
+From 3f9e2420fbb180672a566cbcab6e9dfdaa914c0e Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <dmolkentin@suse.com>
+Date: Thu, 1 Jun 2017 16:59:55 +0200
+Subject: [PATCH] Ensure udev persistent storage compat rules get created and
+ installed
+
+Reference: bsc#1040153
+---
+ modules.d/95udev-rules/module-setup.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
+index 6a0625aa..5e3f444d 100755
+--- a/modules.d/95udev-rules/module-setup.sh
++++ b/modules.d/95udev-rules/module-setup.sh
+@@ -56,6 +56,10 @@ install() {
+     # eudev rules
+     inst_rules 80-drivers-modprobe.rules
+ 
++    # bsc#1040153
++    inst_rules 61-persistent-storage-compat.rules
++    inst_multiple -o ${udevdir}/compat-symlink-generation
++
+     if dracut_module_included "systemd"; then
+         inst_multiple -o ${systemdutildir}/network/*.link
+         [[ $hostonly ]] && inst_multiple -H -o /etc/systemd/network/*.link
+-- 
+2.12.3
+

0522-Fix-typo-from-commit-3f1cdb520.patch

@@ -0,0 +1,26 @@
+From 4ed5df996e5b1ac86ad855152c3e54cdf72294ff Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <dmolkentin@suse.com>
+Date: Mon, 29 May 2017 14:27:16 +0200
+Subject: [PATCH 1/2] Fix typo from commit 3f1cdb520
+
+Reference: bsc#1033238
+---
+ modules.d/01fips/fips.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
+index a005b0f0..ddf03994 100755
+--- a/modules.d/01fips/fips.sh
++++ b/modules.d/01fips/fips.sh
+@@ -83,7 +83,7 @@ do_fips()
+     KERNEL=$(uname -r)
+ 
+     if ! [ -e "/boot/.${_vmname}-${KERNEL}.hmac" ]; then
+-        warn "/boot/.${_vname}-${KERNEL}.hmac does not exist"
++        warn "/boot/.${_vmname}-${KERNEL}.hmac does not exist"
+         return 1
+     fi
+ 
+-- 
+2.12.3
+

0523-98dracut-systemd-Fix-module-force-loading-with-syste.patch

@@ -0,0 +1,30 @@
+From cf7069480ebad261ca76e1e074f0fddf1c38497b Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <dmolkentin@suse.com>
+Date: Fri, 16 Jun 2017 16:32:56 +0200
+Subject: [PATCH 2/2] 98dracut-systemd: Fix module force loading with systemd
+
+This used to work only when specified via the command line
+or if systemd was not being used. However, the exisistence of
+20_force_driver.conf also requires dracut-pre-udev.service
+to be run.
+
+Reference: bsc#986216
+---
+ modules.d/98dracut-systemd/dracut-pre-udev.service | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules.d/98dracut-systemd/dracut-pre-udev.service b/modules.d/98dracut-systemd/dracut-pre-udev.service
+index 73740bef..43408f3e 100644
+--- a/modules.d/98dracut-systemd/dracut-pre-udev.service
++++ b/modules.d/98dracut-systemd/dracut-pre-udev.service
+@@ -15,6 +15,7 @@ Before=systemd-udevd.service dracut-pre-trigger.service
+ After=dracut-cmdline.service
+ Wants=dracut-cmdline.service
+ ConditionPathExists=/usr/lib/initrd-release
++ConditionPathExists=|/etc/cmdline.d/20-force_drivers.conf
+ ConditionDirectoryNotEmpty=|/lib/dracut/hooks/pre-udev
+ ConditionKernelCommandLine=|rd.break=pre-udev
+ ConditionKernelCommandLine=|rd.driver.blacklist
+-- 
+2.12.3
+

0524-Suppress-nonsensical-error-message-bsc-1032029.patch

@@ -0,0 +1,24 @@
+From 33f374affcd65741dcef747c7cb57482d9ff3103 Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <dmolkentin@suse.com>
+Date: Mon, 19 Jun 2017 13:42:43 +0200
+Subject: [PATCH] Suppress nonsensical error message (bsc#1032029)
+
+---
+ dracut.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dracut.sh b/dracut.sh
+index 69833cab..1016d5ae 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -788,6 +788,7 @@ declare -A suse_mod_deps
+ while read -r line; do
+     _suse_mod="${line##*SUSE INITRD: }"
+     _suse_mod="${_suse_mod%% REQUIRES*}"
++    test -z $_suse_mod && continue
+     suse_mod_deps["$_suse_mod"]="${suse_mod_deps["$_suse_mod"]} ${line##*REQUIRES }"
+ done <<< "$(grep -h "^# SUSE INITRD: " /etc/modprobe.d/[0-9][0-9]*.conf)"
+ 
+-- 
+2.12.3
+

dracut.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Jun 19 11:54:44 UTC 2017 - daniel.molkentin@suse.com
+
+- Suppress nonsensical error message (bsc#1032029)
+  adds 0524-Suppress-nonsensical-error-message-bsc-1032029.patch
+
+-------------------------------------------------------------------
+Fri Jun 16 15:47:40 UTC 2017 - daniel.molkentin@suse.com
+
+- 01fips: Fix typo (bsc#1033238)
+  * adds 0522-Fix-typo-from-commit-3f1cdb520.patch
+- 98dracut-systemd: Fix module force loading with systemd (bsc#986216)
+  * adds 0523-98dracut-systemd-Fix-module-force-loading-with-syste.patch
+
+-------------------------------------------------------------------
+Wed Jun  7 08:21:16 UTC 2017 - daniel.molkentin@suse.com
+
+- Ship udev files required by systemd (bsc#1040153)
+  * adds 0521-Ensure-udev-persistent-storage-compat-rules-get-crea.patch
+- Bump package version to 044.1 to allow systemd to depend on this change
+
 -------------------------------------------------------------------
 Thu May 11 09:55:53 UTC 2017 - daniel.molkentin@suse.com
 

dracut.spec

@@ -17,15 +17,17 @@
 
 
 %define dracutlibdir %{_libexecdir}/dracut
+%define _pkg_version 044
 
 Name:           dracut
-Version:        044
+# Need minor increase for reliable conflicts by systemd, use %{_pkg_version} for real version
+Version:        044.1
 Release:        0
 Summary:        Initramfs generator using udev
 License:        GPL-2.0+ and LGPL-2.1+
 Group:          System/Base
 Url:            https://dracut.wiki.kernel.org/
-Source0:        http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz
+Source0:        http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{_pkg_version}.tar.xz
 Source1:        dracut-rpmlintrc
 Source3:        mkinitrd_setup_dummy
 Source4:        purge-kernels
@@ -200,6 +202,10 @@ Patch517:       0517-95fcoe-fixup-fcoe-genrules.sh-for-VN2VN-mode.patch
 Patch518:       0518-90kernel-modules-Fix-backlight-on-Cherrytrail-device.patch
 Patch519:       0519-90kernel-modules-Ensure-phy-drivers-are-loaded-in-in.patch
 Patch520:       0520-Ignore-module-resolution-errors.patch
+Patch521:       0521-Ensure-udev-persistent-storage-compat-rules-get-crea.patch
+Patch522:       0522-Fix-typo-from-commit-3f1cdb520.patch
+Patch523:       0523-98dracut-systemd-Fix-module-force-loading-with-syste.patch
+Patch524:       0524-Suppress-nonsensical-error-message-bsc-1032029.patch
 
 BuildRequires:  asciidoc
 BuildRequires:  bash
@@ -264,7 +270,7 @@ Provides:       %{name}:%{_bindir}/dracut-catimages
 This package contains tools to assemble the local initrd and host configuration.
 
 %prep
-%setup -q
+%setup -q -n dracut-%{_pkg_version}
 
 %patch12 -p1
 %patch13 -p1
@@ -426,6 +432,10 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh
 %patch518 -p1
 %patch519 -p1
 %patch520 -p1
+%patch521 -p1
+%patch522 -p1
+%patch523 -p1
+%patch524 -p1
 
 %build
 %configure\
@@ -437,7 +447,7 @@ make all CFLAGS="%{optflags}" %{?_smp_mflags}
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
-echo -e "#!/bin/bash\nDRACUT_VERSION=%{version}-%{release}" > %{buildroot}/%{dracutlibdir}/dracut-version.sh
+echo -e "#!/bin/bash\nDRACUT_VERSION=%{_pkg_version}-%{release}" > %{buildroot}/%{dracutlibdir}/dracut-version.sh
 
 # use 00systemd-bootchart instead
 rm -fr %{buildroot}/%{dracutlibdir}/modules.d/00bootchart