diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-firstboot-sysroot.service b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-firstboot-sysroot.service index bad8e876a2..3ba677d0e3 100644 --- a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-firstboot-sysroot.service +++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-firstboot-sysroot.service @@ -22,5 +22,4 @@ Before=ostree-prepare-root.service ignition-remount-sysroot.service [Service] Type=oneshot RemainAfterExit=yes -EnvironmentFile=-/run/sysroot.env ExecStart=/usr/sbin/ignition-ostree-mount-sysroot diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-subsequent-sysroot.service b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-subsequent-sysroot.service index f7409b1fee..92dde886f0 100644 --- a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-subsequent-sysroot.service +++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-subsequent-sysroot.service @@ -21,5 +21,4 @@ Before=ostree-prepare-root.service [Service] Type=oneshot RemainAfterExit=yes -EnvironmentFile=-/run/sysroot.env ExecStart=/usr/sbin/ignition-ostree-mount-sysroot diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-sysroot.sh b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-sysroot.sh index 2bc332b2d9..047ba2da37 100755 --- a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-sysroot.sh +++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-mount-sysroot.sh @@ -7,10 +7,7 @@ set -euo pipefail # In the future this will be augmented with a check for whether # or not we've reprovisioned the rootfs, since we don't want to # force on prjquota there. -rootpath="${ROOT_DEVICE_PATH:-/dev/disk/by-label/root}" - -# If root is on a multipath device, we use that one. -# this link is created by our own udev rule. +rootpath=/dev/disk/by-label/root if ! [ -b "${rootpath}" ]; then echo "ignition-ostree-mount-sysroot: Failed to find ${rootpath}" 1>&2 exit 1