systemd-conf: Remove deprecated files
- system.conf: Contains no config at all, the same file up to date is
already installed by systemd recipe
- SRC_URI : these files are already in the SRC_URI, only the
FILESEXTRAPATHS_prepend is required to overwrite them.
- do_install: The files are already installed by main recipe at a
different location :
${D}${systemd_unitdir}/journald.conf.d/00-systemd-conf.conf
${D}${systemd_unitdir}/system.conf.d/00-systemd-conf.conf
systemd_unitdir being /usr/lib/systemd.
Part of yocto update to dunfell
BugzID: 69636
This commit is contained in:
parent
21caf06eb2
commit
83b121a004
|
|
@ -1,57 +0,0 @@
|
|||
# This file is part of systemd.
|
||||
#
|
||||
# systemd is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU Lesser General Public License as published by
|
||||
# the Free Software Foundation; either version 2.1 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Entries in this file show the compile time defaults.
|
||||
# You can change settings by editing this file.
|
||||
# Defaults can be restored by simply deleting this file.
|
||||
#
|
||||
# See systemd-system.conf(5) for details.
|
||||
|
||||
[Manager]
|
||||
#LogLevel=info
|
||||
#LogTarget=journal-or-kmsg
|
||||
#LogColor=yes
|
||||
#LogLocation=no
|
||||
#DumpCore=yes
|
||||
#CrashShell=no
|
||||
#ShowStatus=yes
|
||||
#CrashChVT=1
|
||||
#CPUAffinity=1 2
|
||||
#JoinControllers=cpu,cpuacct net_cls,net_prio
|
||||
#RuntimeWatchdogSec=20s
|
||||
#ShutdownWatchdogSec=10min
|
||||
#CapabilityBoundingSet=
|
||||
#SystemCallArchitectures=
|
||||
#TimerSlackNSec=
|
||||
#DefaultTimerAccuracySec=1min
|
||||
#DefaultStandardOutput=journal
|
||||
#DefaultStandardError=inherit
|
||||
#DefaultTimeoutStartSec=90s
|
||||
#DefaultTimeoutStopSec=90s
|
||||
#DefaultRestartSec=100ms
|
||||
#DefaultStartLimitInterval=10s
|
||||
#DefaultStartLimitBurst=5
|
||||
#DefaultEnvironment=
|
||||
#DefaultCPUAccounting=no
|
||||
#DefaultBlockIOAccounting=no
|
||||
#DefaultMemoryAccounting=no
|
||||
#DefaultLimitCPU=
|
||||
#DefaultLimitFSIZE=
|
||||
#DefaultLimitDATA=
|
||||
#DefaultLimitSTACK=
|
||||
#DefaultLimitCORE=
|
||||
#DefaultLimitRSS=
|
||||
#DefaultLimitNOFILE=
|
||||
#DefaultLimitAS=
|
||||
#DefaultLimitNPROC=
|
||||
#DefaultLimitMEMLOCK=
|
||||
#DefaultLimitLOCKS=
|
||||
#DefaultLimitSIGPENDING=
|
||||
#DefaultLimitMSGQUEUE=
|
||||
#DefaultLimitNICE=
|
||||
#DefaultLimitRTPRIO=
|
||||
#DefaultLimitRTTIME=
|
||||
|
|
@ -1,17 +1,6 @@
|
|||
FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}/${PN}:${THISDIR}/${PN}:"
|
||||
|
||||
SRC_URI_append = " \
|
||||
file://system.conf \
|
||||
file://journald.conf \
|
||||
"
|
||||
|
||||
do_install_append() {
|
||||
mkdir -p ${D}/etc/systemd/
|
||||
cp ${WORKDIR}/system.conf ${D}/etc/systemd
|
||||
|
||||
install -d ${D}${sysconfdir}/systemd
|
||||
install -m 644 ${WORKDIR}/journald.conf ${D}${sysconfdir}/systemd
|
||||
|
||||
# Remove default network configurations
|
||||
rm -rf ${D}${systemd_unitdir}/network
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue