diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/coreos-rootflags.sh b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/coreos-rootflags.sh index 332665e4f3..8c25d96118 100755 --- a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/coreos-rootflags.sh +++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/coreos-rootflags.sh @@ -3,14 +3,7 @@ set -euo pipefail rootpath=/dev/disk/by-label/root -# If the rootfs was reprovisioned, then the user is free to define their own -# rootflags. -if [ -d /run/ignition-ostree-transposefs/root ]; then - exit 0 -fi - eval $(blkid -o export ${rootpath}) -# this really should always be true, but let's be conservative if [ "${TYPE}" == "xfs" ]; then # We use prjquota on XFS by default to aid multi-tenant Kubernetes (and # other container) clusters. See diff --git a/tests/kola/root-reprovision/luks/test.sh b/tests/kola/root-reprovision/luks/test.sh index 4a2307866a..656b6feee6 100755 --- a/tests/kola/root-reprovision/luks/test.sh +++ b/tests/kola/root-reprovision/luks/test.sh @@ -21,6 +21,12 @@ fstype=$(findmnt -nvr / -o FSTYPE) [[ ${fstype} == xfs ]] ok "source is XFS on LUKS device" +rootflags=$(findmnt /sysroot -no OPTIONS) +if ! grep prjquota <<< "${rootflags}"; then + fatal "missing prjquota in root mount flags: ${rootflags}" +fi +ok "root mounted with prjquota" + case "${AUTOPKGTEST_REBOOT_MARK:-}" in "") # check that ignition-ostree-growfs ran diff --git a/tests/kola/root-reprovision/raid1/test.sh b/tests/kola/root-reprovision/raid1/test.sh index f18673e1f9..a1e510cffa 100755 --- a/tests/kola/root-reprovision/raid1/test.sh +++ b/tests/kola/root-reprovision/raid1/test.sh @@ -21,6 +21,12 @@ fstype=$(findmnt -nvr / -o FSTYPE) [[ ${fstype} == xfs ]] ok "source is XFS on RAID1 device" +rootflags=$(findmnt /sysroot -no OPTIONS) +if ! grep prjquota <<< "${rootflags}"; then + fatal "missing prjquota in root mount flags: ${rootflags}" +fi +ok "root mounted with prjquota" + case "${AUTOPKGTEST_REBOOT_MARK:-}" in "") # check that ignition-ostree-growfs didn't run