tests/root-reprovision: Query /sysroot, not /

Prep for enabling composefs. This is the same issue as coreos/coreos-installer#1203
cgwalters · Jan 2, 2024 · 6047b54 · 6047b54
1 parent 76362ab
commit 6047b54
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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"