cleanup

hooks/systemd-udevd/systemd-udevd

@@ -3,18 +3,17 @@
 #
 # false positive
 # shellcheck disable=2154
-{
-    for _binary in /lib/systemd/systemd-udevd udevadm; do
-        copy_binary "$_binary"
-    done
 
-    mkdir -p "${tmpdir}/lib/udev/rules.d"
+for _binary in /lib/systemd/systemd-udevd udevadm; do
+    copy_binary "$_binary"
+done
 
-    printf "%s\n" \
-        'SUBSYSTEMS=="block", ACTION=="add", RUN+="/bin/device-helper"' \
-    > "${tmpdir}/lib/udev/rules.d/device-helper.rules"
+mkdir -p "${tmpdir}/lib/udev/rules.d"
 
-    [ "$monolith" = 1 ] || printf "%s\n" \
-        'ENV{MODALIAS}=="?*", ACTION=="add", RUN+="/bin/modprobe %E{MODALIAS}"' \
-    >> "${tmpdir}/lib/udev/rules.d/device-helper.rules"
-}
+printf "%s\n" \
+    'SUBSYSTEMS=="block", ACTION=="add", RUN+="/bin/device-helper"' \
+> "${tmpdir}/lib/udev/rules.d/device-helper.rules"
+
+[ "$monolith" = 1 ] || printf "%s\n" \
+    'ENV{MODALIAS}=="?*", ACTION=="add", RUN+="/bin/modprobe %E{MODALIAS}"' \
+>> "${tmpdir}/lib/udev/rules.d/device-helper.rules"

hooks/systemd-udevd/systemd-udevd.init

@@ -3,11 +3,10 @@
 #
 # false positive
 # shellcheck disable=2154,2034
-{
-    [ "$break" = devmgr ] && { print "break before run_systemd_udevd()"; sh; }
 
-    /lib/systemd/systemd-udevd -dN never
-    udevadm trigger -c add -t subsystems
-    udevadm trigger -c add -t devices
-    udevadm settle
-}
+[ "$break" = systemd-udevd ] && { print "break before systemd-udevd.init"; sh; }
+
+/lib/systemd/systemd-udevd -dN never
+udevadm trigger -c add -t subsystems
+udevadm trigger -c add -t devices
+udevadm settle

hooks/systemd-udevd/systemd-udevd.init.late

@@ -3,6 +3,5 @@
 #
 # false positive
 # shellcheck disable=2154
-{
-    udevadm control -e
-}
+
+udevadm control -e