]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: use KILL instead of SIGKILL in TEST-52-HONORFIRSTSHUTDOWN
authorFrantisek Sumsal <frantisek@sumsal.cz>
Sat, 4 Jul 2020 18:18:02 +0000 (20:18 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Sun, 5 Jul 2020 10:00:57 +0000 (11:00 +0100)
SIG-prefixed signals for `kill` are not POSIX compliant, so on Ubuntu CI
(which defaults to dash instead of bash) the TEST-52 contains following
error:

[ 9693.549638] sh[51]: + systemctl poweroff --no-block
[ 9693.553130] systemd-logind[26]: System is powering down.
[ 9693.608911] sh[54]: /bin/sh: 1: kill: Illegal option -S

This can be reproduced manually as well, either by running dash, or bash
in POSIX mode:

$ dash -c 'kill -SIGKILL 123'
dash: 1: kill: Illegal option -S

$ bash --posix -c 'kill -SIGKILL 123'
bash: line 0: kill: SIGKILL: invalid signal specification

test/units/test-honor-first-shutdown.service

index 374f1e6b5f98bcb64e4e40c7b9169ffc2e6ec3af..3170f979e258ecb4fc3c5c0a07a04efab6487c1b 100644 (file)
@@ -4,8 +4,8 @@ After=multi-user.target
 
 [Service]
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-ExecStop=sh -c 'kill -SIGKILL $MAINPID'
+ExecStop=sh -c 'kill -KILL $MAINPID'
 FailureAction=reboot
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target