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

sys-apps/systemd: Try harder at not enabling services through /etc

Browse Source 
At installation time, we usually want to enable services through
/lib. This change will stop making the installation to put symlinks
for getty in /etc, since we already do it in /lib.
This commit is contained in:
Krzesimir Nowak 2020-09-25 09:40:16 +02:00
parent 5e98f2cb98
commit 8a64463b04
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -507,7 +507,9 @@ save_enabled_units() {
} }
pkg_preinst() { pkg_preinst() {
save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service # Flatcar: We enable getty and remote-fs unconditionally, so
# no need to find out whether those are enabled or not here.
save_enabled_units {machines,remote-cryptsetup}.target
if ! use split-usr; then if ! use split-usr; then
local dir local dir
@ -559,11 +561,19 @@ pkg_postinst() {
# Flatcar: Reenabling systemd-timesyncd service too. # Flatcar: Reenabling systemd-timesyncd service too.
systemd_reenable systemd-networkd.service systemd-resolved.service systemd-timesyncd.service systemd_reenable systemd-networkd.service systemd-resolved.service systemd-timesyncd.service
# Flatcar: TODO: Possibly replace `systemctl enable` with
# `systemd_enable_service`, so it potentially could enable the
# services by making symlinks in /lib, instead of /etc?
# Currently does nothing, because ENABLED_UNITS end up being
# empty, but might not be true in future.
if [[ ${ENABLED_UNITS[@]} ]]; then if [[ ${ENABLED_UNITS[@]} ]]; then
systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}" systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
fi fi
if [[ -z ${REPLACING_VERSIONS} ]]; then # Flatcar: We enable getty and remote-fs targets ourselves
# above. The code below would modify /etc, which we don't
# want.
if false && [[ -z ${REPLACING_VERSIONS} ]]; then
if type systemctl &>/dev/null; then if type systemctl &>/dev/null; then
systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1 systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
fi fi