From: Richard Maw <richard.maw@codethink.co.uk>
Date: Mon, 19 Feb 2024 17:28:00 +0000 (+0000)
Subject: TEST-55-OOMD: swapoff before adding new swapfile
X-Git-Tag: v256-rc2~97^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9be49de41f6a3d37a07d817866dcbfbd3fa62780;p=thirdparty%2Fsystemd.git

TEST-55-OOMD: swapoff before adding new swapfile

When running test images built with read-only /usr
a swap partition is likely so needs to be turned off first.
---

diff --git a/test/units/testsuite-55.sh b/test/units/testsuite-55.sh
index e5d930175f7..e803ea89c43 100755
--- a/test/units/testsuite-55.sh
+++ b/test/units/testsuite-55.sh
@@ -23,6 +23,7 @@ rm -rf /run/systemd/system/testsuite-55-testbloat.service.d
 
 # Activate swap file if we are in a VM
 if systemd-detect-virt --vm --quiet; then
+    swapoff --all
     if [[ "$(findmnt -n -o FSTYPE /)" == btrfs ]]; then
         btrfs filesystem mkswapfile -s 64M /swapfile
     else