test: Drop /usr overlay workaround

/usr is not erofs anymore in the mkosi images so let's drop the
workaround where we mount a writable tmpfs on top of /usr.

diff --git a/test/units/testsuite-15.sh b/test/units/testsuite-15.sh
index 204fa992199cc3769aaa5ddc58aa0d0bf5f783a5..7143a1597a32e80a501c21b16ac011d40c83a96b 100755 (executable)
--- a/test/units/testsuite-15.sh
+++ b/test/units/testsuite-15.sh
@@ -8,10 +8,6 @@ set -o pipefail
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 
-# Needed to write units to /usr/lib/systemd/system to test /etc and /run overrides.
-maybe_mount_usr_overlay
-trap 'maybe_umount_usr_overlay' EXIT
-
 clear_unit() {
     local unit_name="${1:?}"
     local base suffix

diff --git a/test/units/testsuite-26.sh b/test/units/testsuite-26.sh
index 27aa98edb78c2ef570ba52bb1caddec82c0c96af..61b0ffd8126902b6accd4f60441ba9e170cd03c5 100755 (executable)
--- a/test/units/testsuite-26.sh
+++ b/test/units/testsuite-26.sh
@@ -12,16 +12,10 @@ at_exit() {
         rm -fvr "/usr/lib/systemd/system/$UNIT_NAME" "/etc/systemd/system/$UNIT_NAME.d" "+4"
     fi
 
-    maybe_umount_usr_overlay
-
     rm -f /etc/init.d/issue-24990
     return 0
 }
 
-# Needed for /usr/lib/systemd/system/$UNIT_NAME to test overrides in /etc and /run
-maybe_mount_usr_overlay
-trap at_exit EXIT
-
 # Create a simple unit file for testing
 # Note: the service file is created under /usr on purpose to test
 #       the 'revert' verb as well

diff --git a/test/units/testsuite-60.sh b/test/units/testsuite-60.sh
index c777de8526301bacd7e7600b02e495f3708421ed..e800a7a12c2695d1246f7850bb1521dcef9d6009 100755 (executable)
--- a/test/units/testsuite-60.sh
+++ b/test/units/testsuite-60.sh
@@ -6,10 +6,6 @@ set -o pipefail
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 
-# Needed to create mount.mytmpfs helper
-maybe_mount_usr_overlay
-trap 'maybe_umount_usr_overlay' EXIT
-
 teardown_test_dependencies() (
     set +eux
 

diff --git a/test/units/testsuite-73.sh b/test/units/testsuite-73.sh
index 59f84f20abcd75c06d153a2ae24d55c0c387ee1f..df5af4ba87352d551902e31a175583c2326e5982 100755 (executable)
--- a/test/units/testsuite-73.sh
+++ b/test/units/testsuite-73.sh
@@ -9,10 +9,6 @@ set -o pipefail
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 
-# Needed to generate test locales in /usr/lib
-maybe_mount_usr_overlay
-trap 'maybe_umount_usr_overlay' EXIT
-
 enable_debug() {
     mkdir -p /run/systemd/system/systemd-localed.service.d
     cat >>/run/systemd/system/systemd-localed.service.d/override.conf <<EOF

diff --git a/test/units/util.sh b/test/units/util.sh
index 619cb8ebbfd625db8551503122478113065679d4..879e962fe94676ceea4e47be133ad51a648d0e5f 100755 (executable)
--- a/test/units/util.sh
+++ b/test/units/util.sh
@@ -226,22 +226,6 @@ kernel_supports_lsm() {
     return 1
 }
 
-MOUNTED_USR_OVERLAY=false
-
-maybe_mount_usr_overlay() {
-    if [[ ! -w /usr ]]; then
-        mkdir -p /tmp/usr-overlay/{upperdir,workdir}
-        mount -t overlay -o lowerdir=/usr,upperdir=/tmp/usr-overlay/upperdir,workdir=/tmp/usr-overlay/workdir overlay /usr
-        MOUNTED_USR_OVERLAY=true
-    fi
-}
-
-maybe_umount_usr_overlay() {
-    if "$MOUNTED_USR_OVERLAY"; then
-        umount -l /usr
-    fi
-}
-
 install_extension_images() {
         local os_release
         os_release="$(test -e /etc/os-release && echo /etc/os-release || echo /usr/lib/os-release)"