summaryrefslogtreecommitdiffstats
path: root/test/TEST-08-ISSUE-2730/test.sh
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-12-10 16:05:48 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-03-28 11:46:47 +0100
commitc84752398be61952c94c7413926f173f270eaea6 (patch)
treef3fd1dd57554211615e01e2e8daa1346ad11d6db /test/TEST-08-ISSUE-2730/test.sh
parenttest: move TEST-07-ISSUE-1981 setup to static files (diff)
downloadsystemd-c84752398be61952c94c7413926f173f270eaea6.tar.xz
systemd-c84752398be61952c94c7413926f173f270eaea6.zip
test: move TEST-08-ISSUE-2730 setup to static files and meson scripts
Unfortunately meson does not install symlinks, but copies the symlink destination instead. So symlinks need to be created by a script. This commit adds both symlinks in test/testsuite-08.units/ and meson scriptlet calls. Strictly speaking, the first is not necessary, since nothing reads stuff directly from the source tree.
Diffstat (limited to 'test/TEST-08-ISSUE-2730/test.sh')
-rwxr-xr-xtest/TEST-08-ISSUE-2730/test.sh49
1 files changed, 2 insertions, 47 deletions
diff --git a/test/TEST-08-ISSUE-2730/test.sh b/test/TEST-08-ISSUE-2730/test.sh
index 2fedef7b58..7acca157d2 100755
--- a/test/TEST-08-ISSUE-2730/test.sh
+++ b/test/TEST-08-ISSUE-2730/test.sh
@@ -17,54 +17,9 @@ test_setup() {
setup_basic_environment
- # setup the testsuite service
- cat >$initdir/etc/systemd/system/testsuite.service <<EOF
-[Unit]
-Description=Testsuite service
-
-[Service]
-ExecStart=/bin/sh -x -c 'mount -o remount,rw /dev/sda1 && echo OK > /testok; systemctl poweroff'
-Type=oneshot
-EOF
-
- rm $initdir/etc/fstab
- cat >$initdir/etc/systemd/system/-.mount <<EOF
-[Unit]
-Before=local-fs.target
-
-[Mount]
-What=/dev/sda1
-Where=/
-Type=ext4
-Options=errors=remount-ro,noatime
-
-[Install]
-WantedBy=local-fs.target
-Alias=root.mount
-EOF
-
- cat >$initdir/etc/systemd/system/systemd-remount-fs.service <<EOF
-[Unit]
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=systemd-fsck-root.service
-Before=local-fs-pre.target local-fs.target shutdown.target
-Wants=local-fs-pre.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/systemctl reload /
-EOF
-
- setup_testsuite
+ rm $initdir/etc/fstab
)
-
- ln -s /etc/systemd/system/-.mount $initdir/etc/systemd/system/root.mount
- mkdir -p $initdir/etc/systemd/system/local-fs.target.wants
- ln -s /etc/systemd/system/-.mount $initdir/etc/systemd/system/local-fs.target.wants/-.mount
-
mask_supporting_services
}
-do_test "$@"
+do_test "$@" 08