From: Alexey Shabalin <shaba@altlinux.org>
Date: Fri, 18 Dec 2020 01:32:25 +0000 (+0300)
Subject: fix(06dbus): do not hardcode path to systemd unit
X-Git-Tag: 052~138
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b3c6e1bb098791e34b09895b88b82c656b170f6;p=thirdparty%2Fdracut.git

fix(06dbus): do not hardcode path to systemd unit

Use $systemdsystemunitdir instead /usr/lib/systemd/system.
---

diff --git a/modules.d/06dbus/module-setup.sh b/modules.d/06dbus/module-setup.sh
index b1d0c7a20..abf67a5b6 100755
--- a/modules.d/06dbus/module-setup.sh
+++ b/modules.d/06dbus/module-setup.sh
@@ -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"
 }