Accepting request 574317 from home:fos:branches:Base:System

Fixed comment

OBS-URL: https://build.opensuse.org/request/show/574317
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=336

0555-Avoid-executing-emergency-hooks-twice.patch

@@ -0,0 +1,38 @@
+From 64511ab0b73df0c9d704e61b14beba641818dd56 Mon Sep 17 00:00:00 2001
+From: Ignaz Forster <iforster@suse.com>
+Date: Tue, 6 Feb 2018 17:32:47 +0100
+Subject: [PATCH] Avoid executing emergency hooks twice
+
+When using systemd emergency hooks were executed twice; this patch will avoid
+that by only calling the hook of systemd is not called anyway.
+Also see https://github.com/dracutdevs/dracut/pull/374
+---
+ modules.d/99base/dracut-lib.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: dracut-044/modules.d/99base/dracut-lib.sh
+===================================================================
+--- dracut-044.orig/modules.d/99base/dracut-lib.sh
++++ dracut-044/modules.d/99base/dracut-lib.sh
+@@ -1072,6 +1072,7 @@ _emergency_shell()
+         rm -f -- /.console_lock
+     else
+         debug_off
++        source_hook "$hook"
+         echo
+         /sbin/rdsosreport
+         echo 'You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot'
+@@ -1122,12 +1123,12 @@ emergency_shell()
+ 
+     echo ; echo
+     warn "$*"
+-    source_hook "$hook"
+     echo
+ 
+     if getargbool 1 rd.shell -d -y rdshell || getarg rd.break -d rdbreak; then
+         _emergency_shell $_rdshell_name
+     else
++        source_hook "$hook"
+         warn "$action has failed. To debug this issue add \"rd.shell rd.debug\" to the kernel command line."
+         # cause a kernel panic
+         exit 1

dracut.spec

@@ -362,6 +362,8 @@ Patch552:       0552-98integrity-support-validating-the-IMA-policy-file-s.patch
 Patch553:       0553-98integrity-support-loading-x509-into-the-trusted-bu.patch
 # Patch submitted to upstream as cb2c9a4338ddc15d55c6c524276a1807bec23485
 Patch554:       0554-98integrity-support-X.509-only-EVM-configuration.patch
+# Applied upstream as 94f61235d760337fdef692fac5ead589e8f3ab0e
+Patch555:       0555-Avoid-executing-emergency-hooks-twice.patch
 
 BuildRequires:  asciidoc
 BuildRequires:  bash
@@ -638,6 +640,7 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh
 %patch552 -p1
 %patch553 -p1
 %patch554 -p1
+%patch555 -p1
 
 %build
 %configure\