Harald Hoyer 460d2c
From 46f3156426e1b770e4876a654738e1c3e01851af Mon Sep 17 00:00:00 2001
Harald Hoyer 460d2c
From: Martin Wilck <mwilck@suse.de>
Harald Hoyer 460d2c
Date: Fri, 26 Jun 2020 18:50:47 +0200
Harald Hoyer 460d2c
Subject: [PATCH] 91zipl: parse-zipl.sh: honor SYSTEMD_READY
Harald Hoyer 460d2c
Harald Hoyer 460d2c
The zipl partition should not be mounted if SYSTEMD_READY=0 is set.
Harald Hoyer 460d2c
Otherwise booting issues with multipath will result.
Harald Hoyer 460d2c
---
Harald Hoyer 460d2c
 modules.d/91zipl/parse-zipl.sh | 2 +-
Harald Hoyer 460d2c
 1 file changed, 1 insertion(+), 1 deletion(-)
Harald Hoyer 460d2c
Harald Hoyer 460d2c
diff --git a/modules.d/91zipl/parse-zipl.sh b/modules.d/91zipl/parse-zipl.sh
Harald Hoyer 460d2c
index 308f228b..ddab0ea9 100755
Harald Hoyer 460d2c
--- a/modules.d/91zipl/parse-zipl.sh
Harald Hoyer 460d2c
+++ b/modules.d/91zipl/parse-zipl.sh
Harald Hoyer 460d2c
@@ -31,7 +31,7 @@ if [ -n "$zipl_arg" ] ; then
Harald Hoyer 460d2c
     esac
Harald Hoyer 460d2c
     if [ "$zipl_env" ] ; then
Harald Hoyer 460d2c
         {
Harald Hoyer 460d2c
-            printf 'ACTION=="add|change", SUBSYSTEM=="block", %s=="%s", RUN+="/sbin/initqueue --settled --onetime --unique --name install_zipl_cmdline /sbin/install_zipl_cmdline.sh %s"\n' \
Harald Hoyer 460d2c
+            printf 'ACTION=="add|change", SUBSYSTEM=="block", %s=="%s", ENV{SYSTEMD_READY}!="0", RUN+="/sbin/initqueue --settled --onetime --unique --name install_zipl_cmdline /sbin/install_zipl_cmdline.sh %s"\n' \
Harald Hoyer 460d2c
                 ${zipl_env} ${zipl_val} ${zipl_arg}
Harald Hoyer 460d2c
             echo "[ -f /tmp/install.zipl.cmdline-done ]" >$hookdir/initqueue/finished/wait-zipl-conf.sh
Harald Hoyer 460d2c
         } >> /etc/udev/rules.d/99zipl-conf.rules
Harald Hoyer 460d2c