From fbaf4073656e28b9e9f975a8297e64e900cd067d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 2 Jan 2024 15:25:06 -0500
Subject: [PATCH] tests/root-reprovision: Query `/sysroot`, not `/`

Prep for enabling composefs.  This is the same issue as
https://github.com/coreos/coreos-installer/pull/1203
---
 tests/kola/root-reprovision/filesystem-only/test.sh  | 2 +-
 tests/kola/root-reprovision/linear/test.sh           | 4 ++--
 tests/kola/root-reprovision/luks/data/luks-test.sh   | 4 ++--
 tests/kola/root-reprovision/swap-before-root/test.sh | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/kola/root-reprovision/filesystem-only/test.sh b/tests/kola/root-reprovision/filesystem-only/test.sh
index 43cd85af1a..6dd520d5bd 100755
--- a/tests/kola/root-reprovision/filesystem-only/test.sh
+++ b/tests/kola/root-reprovision/filesystem-only/test.sh
@@ -14,7 +14,7 @@ set -xeuo pipefail
 # shellcheck disable=SC1091
 . "$KOLA_EXT_DATA/commonlib.sh"
 
-fstype=$(findmnt -nvr / -o FSTYPE)
+fstype=$(findmnt -nvr /sysroot -o FSTYPE)
 [[ $fstype == ext4 ]]
 ok "source is ext4"
 
diff --git a/tests/kola/root-reprovision/linear/test.sh b/tests/kola/root-reprovision/linear/test.sh
index 3dce05e080..2fe204a14d 100755
--- a/tests/kola/root-reprovision/linear/test.sh
+++ b/tests/kola/root-reprovision/linear/test.sh
@@ -18,13 +18,13 @@ set -xeuo pipefail
 # shellcheck disable=SC1091
 . "$KOLA_EXT_DATA/commonlib.sh"
 
-srcdev=$(findmnt -nvr / -o SOURCE)
+srcdev=$(findmnt -nvr /sysroot -o SOURCE)
 [[ ${srcdev} == $(realpath /dev/md/foobar) ]]
 
 blktype=$(lsblk -o TYPE "${srcdev}" --noheadings)
 [[ ${blktype} == linear ]]
 
-fstype=$(findmnt -nvr / -o FSTYPE)
+fstype=$(findmnt -nvr /sysroot -o FSTYPE)
 [[ ${fstype} == xfs ]]
 ok "source is XFS on linear device"
 
diff --git a/tests/kola/root-reprovision/luks/data/luks-test.sh b/tests/kola/root-reprovision/luks/data/luks-test.sh
index 8e2f8b47be..615b4fd175 100755
--- a/tests/kola/root-reprovision/luks/data/luks-test.sh
+++ b/tests/kola/root-reprovision/luks/data/luks-test.sh
@@ -4,13 +4,13 @@
 # shellcheck disable=SC1091
 . "$KOLA_EXT_DATA/commonlib.sh"
 
-srcdev=$(findmnt -nvr / -o SOURCE)
+srcdev=$(findmnt -nvr /sysroot -o SOURCE)
 [[ ${srcdev} == /dev/mapper/myluksdev ]]
 
 blktype=$(lsblk -o TYPE "${srcdev}" --noheadings)
 [[ ${blktype} == crypt ]]
 
-fstype=$(findmnt -nvr / -o FSTYPE)
+fstype=$(findmnt -nvr /sysroot -o FSTYPE)
 [[ ${fstype} == xfs ]]
 ok "source is XFS on LUKS device"
 
diff --git a/tests/kola/root-reprovision/swap-before-root/test.sh b/tests/kola/root-reprovision/swap-before-root/test.sh
index 654e5eee5e..2deb4b8efd 100755
--- a/tests/kola/root-reprovision/swap-before-root/test.sh
+++ b/tests/kola/root-reprovision/swap-before-root/test.sh
@@ -23,7 +23,7 @@ swapstatus=$(systemctl is-active dev-disk-by\\x2dpartlabel-swap.swap)
 [[ ${swapstatus} == active ]]
 ok "swap is active"
 
-fstype=$(findmnt -nvr / -o FSTYPE)
+fstype=$(findmnt -nvr /sysroot -o FSTYPE)
 [[ ${fstype} == xfs ]]
 ok "source is xfs"