ignition-ostree-transposefs: don't run if multipath is enabled

https://issues.redhat.com/browse/OCPBUGS-16157
coreos · Jul 26, 2023 · 971019d · 971019d
1 parent 208630a
commit 971019d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/...r/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-autosave-xfs.service b/...r/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-autosave-xfs.service
@@ -12,6 +12,8 @@ OnFailureJobMode=isolate
 ConditionKernelCommandLine=ostree
 # only run if ignition-ostree-growfs ran since that's when pathological cases occur
 ConditionPathExists=/run/ignition-ostree-growfs.stamp
+# https://issues.redhat.com/browse/OCPBUGS-16157
+ConditionKernelCommandLine=!rd.multipath
 
 [Service]
 Type=oneshot

diff --git a/...ore/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-detect.service b/...ore/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-detect.service
@@ -8,6 +8,8 @@ Before=sysroot.mount
 ConditionKernelCommandLine=ostree
 OnFailure=emergency.target
 OnFailureJobMode=isolate
+# https://issues.redhat.com/browse/OCPBUGS-16157
+ConditionKernelCommandLine=!rd.multipath
 
 # This stage requires udevd to detect disks
 Requires=systemd-udevd.service

diff --git a/...re/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-restore.service b/...re/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-restore.service
@@ -11,6 +11,8 @@ OnFailureJobMode=isolate
 
 ConditionKernelCommandLine=ostree
 ConditionPathIsDirectory=/run/ignition-ostree-transposefs
+# https://issues.redhat.com/browse/OCPBUGS-16157
+ConditionKernelCommandLine=!rd.multipath
 
 [Service]
 Type=oneshot

diff --git a/...5core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-save.service b/...5core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs-save.service
@@ -5,6 +5,8 @@ After=ignition-ostree-transposefs-detect.service
 Before=ignition-disks.service
 ConditionKernelCommandLine=ostree
 ConditionPathIsDirectory=/run/ignition-ostree-transposefs
+# https://issues.redhat.com/browse/OCPBUGS-16157
+ConditionKernelCommandLine=!rd.multipath
 # Any services looking at mounts need to order after this
 # because it causes device re-probing.
 After=coreos-gpt-setup.service