kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Use $systemdsystemunitdir instead /usr/lib/systemd/system.
master
Alexey Shabalin 2020-12-18 04:32:25 +03:00 committed by Jóhann B. Guðmundsson
parent b955dbf4a9
commit 7b3c6e1bb0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules.d/06dbus/module-setup.sh
View File

@ -59,12 +59,12 @@ install() {
Conflicts=shutdown.target\ Conflicts=shutdown.target\
Before=shutdown.target Before=shutdown.target
/^\[Socket\]/aRemoveOnStop=yes' \ /^\[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, #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 #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. #services that are dependent on dbus.service.
sed -i -Ee \ sed -i -Ee \
'/^After/s/(After[[:space:]]*=.*)(local-fs.target[[:space:]]*)(.*)/\1-\.mount \3/' \ '/^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"
} }