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.
This commit is contained in:
parent
58a1bdb467
commit
c84752398b
|
@ -17,54 +17,9 @@ test_setup() {
|
||||||
|
|
||||||
setup_basic_environment
|
setup_basic_environment
|
||||||
|
|
||||||
# setup the testsuite service
|
rm $initdir/etc/fstab
|
||||||
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
|
|
||||||
)
|
)
|
||||||
|
|
||||||
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
|
mask_supporting_services
|
||||||
}
|
}
|
||||||
|
|
||||||
do_test "$@"
|
do_test "$@" 08
|
||||||
|
|
|
@ -17,6 +17,18 @@ install_subdir('testsuite-04.units',
|
||||||
install_subdir('testsuite-06.units',
|
install_subdir('testsuite-06.units',
|
||||||
install_dir : testdata_dir)
|
install_dir : testdata_dir)
|
||||||
|
|
||||||
|
testsuite08_dir = testdata_dir + '/testsuite-08.units'
|
||||||
|
install_data('testsuite-08.units/-.mount',
|
||||||
|
install_dir : testsuite08_dir)
|
||||||
|
install_data('testsuite-08.units/systemd-remount-fs.service',
|
||||||
|
install_dir : testsuite08_dir)
|
||||||
|
meson.add_install_script(meson_make_symlink,
|
||||||
|
'./-.mount',
|
||||||
|
testsuite08_dir + '/root.mount')
|
||||||
|
meson.add_install_script(meson_make_symlink,
|
||||||
|
'../-.mount',
|
||||||
|
testsuite08_dir + '/local-fs.target.wants/-.mount')
|
||||||
|
|
||||||
if conf.get('ENABLE_RESOLVE') == 1
|
if conf.get('ENABLE_RESOLVE') == 1
|
||||||
install_subdir('test-resolve',
|
install_subdir('test-resolve',
|
||||||
install_dir : testdata_dir)
|
install_dir : testdata_dir)
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
[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
|
|
@ -0,0 +1 @@
|
||||||
|
../-.mount
|
|
@ -0,0 +1 @@
|
||||||
|
-.mount
|
|
@ -0,0 +1,11 @@
|
||||||
|
[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 /
|
|
@ -0,0 +1,6 @@
|
||||||
|
[Unit]
|
||||||
|
Description=TEST-08-ISSUE-2730
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
ExecStart=sh -x -c 'mount -o remount,rw /dev/sda1 && echo OK >/testok; systemctl poweroff'
|
||||||
|
Type=oneshot
|
|
@ -5,8 +5,8 @@ set -eu
|
||||||
# and we need to create the target directory...
|
# and we need to create the target directory...
|
||||||
|
|
||||||
mkdir -vp "$(dirname "${DESTDIR:-}$2")"
|
mkdir -vp "$(dirname "${DESTDIR:-}$2")"
|
||||||
if [ "$(dirname $1)" = . ]; then
|
if [ "$(dirname $1)" = . -o "$(dirname $1)" = .. ]; then
|
||||||
ln -vfs -T "$1" "${DESTDIR:-}$2"
|
ln -vfs -T -- "$1" "${DESTDIR:-}$2"
|
||||||
else
|
else
|
||||||
ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2"
|
ln -vfs -T --relative -- "${DESTDIR:-}$1" "${DESTDIR:-}$2"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue