Skip to content

Commit

Permalink
tests/root-reprovision: Query /sysroot, not /
Browse files Browse the repository at this point in the history
Prep for enabling composefs.  This is the same issue as
coreos/coreos-installer#1203
  • Loading branch information
cgwalters authored and aaradhak committed Mar 18, 2024
1 parent 3fcd55f commit fbaf407
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion tests/kola/root-reprovision/filesystem-only/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions tests/kola/root-reprovision/linear/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions tests/kola/root-reprovision/luks/data/luks-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion tests/kola/root-reprovision/swap-before-root/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit fbaf407

Please sign in to comment.