Merge pull request #19330 from mrc0mmand/shellcheck-pt2

test: make test-functions shellcheck-compliant
systemd-networkd.socket: Add conflict with shutdown.target (#19348 )
2025-10-08 13:14:45 +02:00 · 2021-04-19 09:04:19 +02:00 · 2021-04-19 11:25:33 +09:00 · 2021-04-16 19:05:59 +02:00 · 2021-04-16 19:05:55 +02:00 · 2021-04-16 19:05:42 +02:00
2 changed files with 770 additions and 736 deletions
--- a/test/test-functions
+++ b/test/test-functions
--- a/units/systemd-networkd.socket
+++ b/units/systemd-networkd.socket
@ -12,7 +12,8 @@ Description=Network Service Netlink Socket
 Documentation=man:systemd-networkd.service(8) man:rtnetlink(7)
 ConditionCapability=CAP_NET_ADMIN
 DefaultDependencies=no
-Before=sockets.target
+Before=sockets.target shutdown.target
 Conflicts=shutdown.target
 [Socket]
 ReceiveBuffer=128M
Author	SHA1	Message	Date
Zbigniew Jędrzejewski-Szmek	5c7466b492	Merge pull request #19330 from mrc0mmand/shellcheck-pt2 test: make test-functions shellcheck-compliant	2021-04-19 09:04:19 +02:00
sverdlin	3181521f92	systemd-networkd.socket: Add conflict with shutdown.target (#19348 ) systemd-networkd.socket can re-start systemd-networkd.service in shutdown and by doing this even stop shutdown.target leaving the system in halfway-down state. Fixes #4955.	2021-04-19 11:25:33 +09:00
Frantisek Sumsal	94009c27f4	test: rewrite kernel module handling This code was partially broken, since the firmware directory was undefined. Also, some of the parts were a dead code, since they relied on code from the original dracut test suite.	2021-04-16 19:05:59 +02:00
Frantisek Sumsal	0f1947059b	test: use arrays when applicable	2021-04-16 19:05:55 +02:00
Frantisek Sumsal	a33e2692e1	test: avoid using pipes in certain cases `command -v <bin> \| grep ...` can under certain conditions cause the `command` to exit with SIGPIPE, which in combination with `set -o pipefail` means that the tests sometimes randomly die during setup. Let's avoid using pipes in such cases.	2021-04-16 19:05:42 +02:00
Frantisek Sumsal	96af59aabb	test: use set -o pipefail This breaks some existing loops which previously ignored if the piped program exited with EC >0. Rewrite them to mitigate this (and also make them more robust in some cases).	2021-04-16 19:05:37 +02:00
Frantisek Sumsal	1b8fcd9c63	test: shell code cleanup Just some basic stuff, like double quotes around strings, using predictable values for possibly unset variables, formatting, etc.	2021-04-16 18:49:37 +02:00