summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2024-07-17 16:34:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-07-18 17:21:39 +0100
commit67f3f2edd333772b5f5f3581679b8ee434d4ba16 (patch)
tree7da8daa9f4308f5f413bf319191b081a44a361ca /meta/recipes-core/systemd
parente66e9d255db599a62187bfc0d88709df2bf01037 (diff)
downloadpoky-67f3f2edd333772b5f5f3581679b8ee434d4ba16.tar.gz
systemd: Correct the indentation in do_install()
There was a mix of using tabs and spaces for indentation. (From OE-Core rev: e0442c791578c55c7f198ae389cb820a7bf437d5) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r--meta/recipes-core/systemd/systemd_256.bb27
1 files changed, 14 insertions, 13 deletions
diff --git a/meta/recipes-core/systemd/systemd_256.bb b/meta/recipes-core/systemd/systemd_256.bb
index a197b16583..807254c816 100644
--- a/meta/recipes-core/systemd/systemd_256.bb
+++ b/meta/recipes-core/systemd/systemd_256.bb
@@ -279,16 +279,17 @@ WATCHDOG_TIMEOUT ??= "60"
279 279
280do_install() { 280do_install() {
281 meson_do_install 281 meson_do_install
282
282 if ${@bb.utils.contains('PACKAGECONFIG', 'sysusers', 'true', 'false', d)}; then 283 if ${@bb.utils.contains('PACKAGECONFIG', 'sysusers', 'true', 'false', d)}; then
283 # Change the root user's home directory in /lib/sysusers.d/basic.conf. 284 # Change the root user's home directory in /lib/sysusers.d/basic.conf.
284 # This is done merely for backward compatibility with previous systemd recipes. 285 # This is done merely for backward compatibility with previous systemd recipes.
285 # systemd hardcodes root user's HOME to be "/root". Changing to use other values 286 # systemd hardcodes root user's HOME to be "/root". Changing to use other values
286 # may have unexpected runtime behaviors. 287 # may have unexpected runtime behaviors.
287 if [ "${ROOT_HOME}" != "/root" ]; then 288 if [ "${ROOT_HOME}" != "/root" ]; then
288 bbwarn "Using ${ROOT_HOME} as root user's home directory is not fully supported by systemd" 289 bbwarn "Using ${ROOT_HOME} as root user's home directory is not fully supported by systemd"
289 sed -i -e 's#/root#${ROOT_HOME}#g' ${D}${exec_prefix}/lib/sysusers.d/basic.conf 290 sed -i -e 's#/root#${ROOT_HOME}#g' ${D}${exec_prefix}/lib/sysusers.d/basic.conf
290 fi 291 fi
291 fi 292 fi
292 install -d ${D}/${base_sbindir} 293 install -d ${D}/${base_sbindir}
293 if ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 'false', 'true', d)}; then 294 if ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 'false', 'true', d)}; then
294 # Provided by a separate recipe 295 # Provided by a separate recipe
@@ -396,10 +397,10 @@ do_install() {
396 # add a profile fragment to disable systemd pager with busybox less 397 # add a profile fragment to disable systemd pager with busybox less
397 install -Dm 0644 ${UNPACKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh 398 install -Dm 0644 ${UNPACKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh
398 399
399 if [ -n "${WATCHDOG_TIMEOUT}" ]; then 400 if [ -n "${WATCHDOG_TIMEOUT}" ]; then
400 sed -i -e 's/#RebootWatchdogSec=10min/RebootWatchdogSec=${WATCHDOG_TIMEOUT}/' \ 401 sed -i -e 's/#RebootWatchdogSec=10min/RebootWatchdogSec=${WATCHDOG_TIMEOUT}/' \
401 ${D}/${sysconfdir}/systemd/system.conf 402 ${D}/${sysconfdir}/systemd/system.conf
402 fi 403 fi
403 404
404 if ${@bb.utils.contains('PACKAGECONFIG', 'pni-names', 'true', 'false', d)}; then 405 if ${@bb.utils.contains('PACKAGECONFIG', 'pni-names', 'true', 'false', d)}; then
405 if ! grep -q '^NamePolicy=.*mac' ${D}${rootlibexecdir}/systemd/network/99-default.link; then 406 if ! grep -q '^NamePolicy=.*mac' ${D}${rootlibexecdir}/systemd/network/99-default.link; then