mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
systemd: Revert inappropriate use of ${systemd_system_unitdir}
This is a partial revert of commit 5ace3ada (systemd:
'${systemd_unitdir}/system' => '${systemd_system_unitdir}') where
the string '${systemd_unitdir}/system' matched something other than the
intended directory.
(From OE-Core rev: b3334c7134e812fe839e47a3d06aa5379b7b8bd8)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
c758988cb7
commit
04c99437a3
@@ -267,7 +267,7 @@ do_install() {
|
|||||||
install -d ${D}${sysconfdir}/init.d
|
install -d ${D}${sysconfdir}/init.d
|
||||||
install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd
|
install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd
|
||||||
sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd
|
sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd
|
||||||
install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_system_unitdir}d-sysv-install
|
install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if "${@'true' if oe.types.boolean(d.getVar('VOLATILE_LOG_DIR')) else 'false'}"; then
|
if "${@'true' if oe.types.boolean(d.getVar('VOLATILE_LOG_DIR')) else 'false'}"; then
|
||||||
@@ -341,7 +341,7 @@ do_install() {
|
|||||||
|
|
||||||
# install default policy for presets
|
# install default policy for presets
|
||||||
# https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto
|
# https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto
|
||||||
install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_system_unitdir}-preset/99-default.preset
|
install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset
|
||||||
|
|
||||||
# add a profile fragment to disable systemd pager with busybox less
|
# add a profile fragment to disable systemd pager with busybox less
|
||||||
install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh
|
install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh
|
||||||
|
|||||||
Reference in New Issue
Block a user