system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-06 16:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: don't mask "supporting" services in TEST-01-BASIC

Browse source 
This got lost during one of the code de-duplication attempts.
This commit is contained in:
Frantisek Sumsal 2021-04-30 21:02:41 +02:00
parent 88c2c8a0ba
commit 7776b22521
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
test/test-functions
View file

@ -1551,11 +1551,11 @@ setup_basic_dirs() {
mask_supporting_services() {
# mask some services that we do not want to run in these tests
ln -fs /dev/null "${initdir:?}/etc/systemd/system/systemd-hwdb-update.service"
ln -fs /dev/null "$initdir/etc/systemd/system/systemd-journal-catalog-update.service"
ln -fs /dev/null "$initdir/etc/systemd/system/systemd-networkd.service"
ln -fs /dev/null "$initdir/etc/systemd/system/systemd-networkd.socket"
ln -fs /dev/null "$initdir/etc/systemd/system/systemd-resolved.service"
ln -fsv /dev/null "${initdir:?}/etc/systemd/system/systemd-hwdb-update.service"
ln -fsv /dev/null "$initdir/etc/systemd/system/systemd-journal-catalog-update.service"
ln -fsv /dev/null "$initdir/etc/systemd/system/systemd-networkd.service"
ln -fsv /dev/null "$initdir/etc/systemd/system/systemd-networkd.socket"
ln -fsv /dev/null "$initdir/etc/systemd/system/systemd-resolved.service"
}
inst_libs() {
@ -2335,7 +2335,13 @@ test_create_image() {
(
LOG_LEVEL=5
setup_basic_environment
mask_supporting_services
# We want to test all services in TEST-01-BASIC, but mask them in
# all other tests
if [[ "$TESTID" != "01" ]]; then
dinfo "Masking supporting services"
mask_supporting_services
fi
)
}