mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-18 21:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #810 from kinvolk/krnowak/systemd-install-fix

Browse Source 
sys-apps/systemd: Fix unit installation
This commit is contained in:
Krzesimir Nowak 2021-02-01 19:06:12 +01:00 committed by GitHub
commit e900e5d6ea
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild vendored
View File

@ -439,7 +439,7 @@ multilib_src_install_all() {
systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf
# Flatcar: Don't default to graphical.target. # Flatcar: Don't default to graphical.target.
local unitdir=$(PKG_CONFIG_LIBDIR="${PWD}/src/core" systemd_get_systemunitdir) local unitdir=$(builddir_systemd_get_systemunitdir)
dosym multi-user.target "${unitdir}"/default.target dosym multi-user.target "${unitdir}"/default.target
# Flatcar: Don't set any extra environment variables by default. # Flatcar: Don't set any extra environment variables by default.
@ -449,35 +449,35 @@ multilib_src_install_all() {
# preset file (90-systemd.preset). We do it that way, to avoid # preset file (90-systemd.preset). We do it that way, to avoid
# putting symlink in /etc. Please keep the lines in the same # putting symlink in /etc. Please keep the lines in the same
# order as the "enable" lines appear in the preset file. # order as the "enable" lines appear in the preset file.
systemd_enable_service multi-user.target remote-fs.target builddir_systemd_enable_service multi-user.target remote-fs.target
systemd_enable_service multi-user.target remote-cryptsetup.target builddir_systemd_enable_service multi-user.target remote-cryptsetup.target
systemd_enable_service multi-user.target machines.target builddir_systemd_enable_service multi-user.target machines.target
# Flatcar: getty@.service is enabled manually below. # Flatcar: getty@.service is enabled manually below.
systemd_enable_service sysinit.target systemd-timesyncd.service builddir_systemd_enable_service sysinit.target systemd-timesyncd.service
systemd_enable_service multi-user.target systemd-networkd.service builddir_systemd_enable_service multi-user.target systemd-networkd.service
# Flatcar: For systemd-networkd.service, it has it in Also, which also # Flatcar: For systemd-networkd.service, it has it in Also, which also
# needs to be enabled # needs to be enabled
systemd_enable_service sockets.target systemd-networkd.socket builddir_systemd_enable_service sockets.target systemd-networkd.socket
# Flatcar: For systemd-networkd.service, it has it in Also, which also # Flatcar: For systemd-networkd.service, it has it in Also, which also
# needs to be enabled # needs to be enabled
systemd_enable_service network-online.target systemd-networkd-wait-online.service builddir_systemd_enable_service network-online.target systemd-networkd-wait-online.service
systemd_enable_service multi-user.target systemd-resolved.service builddir_systemd_enable_service multi-user.target systemd-resolved.service
if use homed; then if use homed; then
systemd_enable_service multi-user.target systemd-homed.target builddir_systemd_enable_service multi-user.target systemd-homed.target
# Flatcar: systemd-homed.target has # Flatcar: systemd-homed.target has
# Also=systemd-userdbd.service, but the service has no # Also=systemd-userdbd.service, but the service has no
# WantedBy entry. It's likely going to be executed through # WantedBy entry. It's likely going to be executed through
# systemd-userdbd.socket, which is enabled in upstream's # systemd-userdbd.socket, which is enabled in upstream's
# presets file. # presets file.
systemd_enable_service sockets.target systemd-userdbd.socket builddir_systemd_enable_service sockets.target systemd-userdbd.socket
fi fi
systemd_enable_service sysinit.target systemd-pstore.service builddir_systemd_enable_service sysinit.target systemd-pstore.service
# Flatcar: not enabling reboot.target - it has no WantedBy # Flatcar: not enabling reboot.target - it has no WantedBy
# entry. # entry.
# Flatcar: Enable getty manually. # Flatcar: Enable getty manually.
mkdir --parents "${ED}/usr/lib/systemd/system/getty.target.wants" dodir "${unitdir}/getty.target.wants"
dosym ../getty@.service "/usr/lib/systemd/system/getty.target.wants/getty@tty1.service" dosym ../getty@.service "${unitdir}/getty.target.wants/getty@tty1.service"
# Flatcar: Use an empty preset file, because systemctl # Flatcar: Use an empty preset file, because systemctl
# preset-all puts symlinks in /etc, not in /usr. We don't use # preset-all puts symlinks in /etc, not in /usr. We don't use
@ -499,6 +499,20 @@ multilib_src_install_all() {
# dropped it. # dropped it.
} }
builddir_systemd_enable_service() {
(
export SYSROOT="${ED}"
systemd_enable_service "$@"
)
}
builddir_systemd_get_systemunitdir() {
(
export SYSROOT="${ED}"
systemd_get_systemunitdir
)
}
migrate_locale() { migrate_locale() {
local envd_locale_def="${EROOT}/etc/env.d/02locale" local envd_locale_def="${EROOT}/etc/env.d/02locale"
local envd_locale=( "${EROOT}"/etc/env.d/??locale ) local envd_locale=( "${EROOT}"/etc/env.d/??locale )