]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
fix(06dbus): do not hardcode path to systemd unit
authorAlexey Shabalin <shaba@altlinux.org>
Fri, 18 Dec 2020 01:32:25 +0000 (04:32 +0300)
committerJóhann B. Guðmundsson <johannbg@gmail.com>
Thu, 21 Jan 2021 16:53:30 +0000 (16:53 +0000)
Use $systemdsystemunitdir instead /usr/lib/systemd/system.

modules.d/06dbus/module-setup.sh

index b1d0c7a20a2c91028fdd80f4d5c65d8631df21de..abf67a5b677c4bb595ce20aeba732fbf78ad2523 100755 (executable)
@@ -59,12 +59,12 @@ install() {
 Conflicts=shutdown.target\
 Before=shutdown.target
 /^\[Socket\]/aRemoveOnStop=yes' \
-    "$initdir"/usr/lib/systemd/system/dbus.socket
+    "$initdir$systemdsystemunitdir/dbus.socket"
 
   #We need to make sure that systemd-tmpfiles-setup.service->dbus.socket will not wait local-fs.target to start,
   #If swap is encrypted, this would make dbus wait the timeout for the swap before loading. This could delay sysinit
   #services that are dependent on dbus.service.
   sed -i -Ee \
     '/^After/s/(After[[:space:]]*=.*)(local-fs.target[[:space:]]*)(.*)/\1-\.mount \3/' \
-    "$initdir"/usr/lib/systemd/system/systemd-tmpfiles-setup.service
+    "$initdir$systemdsystemunitdir/systemd-tmpfiles-setup.service"
 }