mirror of
https://github.com/systemd/systemd.git
synced 2024-12-22 17:35:35 +03:00
manager: optionally, do a full preset on first boot
A compile time option is added to select behaviour: by default
UNIT_FILE_PRESET_ENABLE_ONLY is still used, but the intent is to change to
UNIT_FILE_PRESET_FULL at some point in the future. Distros that want to
opt-in can use the config option to change the behaviour.
(The option is just a boolean: it would be possible to make it multi-valued,
and allow full, enable-only, disable-only, none. But so far nobody has asked
for this, and it's better not to complicate things needlessly.)
With the configuration option flipped, instead of only doing enablements,
perform a full preset on first boot. The reason is that although
`/etc/machine-id` might be missing, there may be other files provisioned in
`/etc` (in fact, this use case is mentioned in `log_execution_mode`). Some of
those possible files include enablement symlinks even if presets dictate it
should be disabled.
Such a seemingly contradictory situation occurs in {RHEL,Fedora} CoreOS,
where we ship `/etc` as if `preset-all` were called. However, we want to
allow users to disable default-enabled services via Ignition, which does
this by creating preset dropins before switchroot. (For why we do
`preset-all` at compose time, see:
https://github.com/coreos/fedora-coreos-config/pull/77).
For example, the composed FCOS image has a `enable zincati.service`
preset and an enablement for that in `/etc`, while at boot time when we
switch root, there may be a `disable zincati.service` preset with higher
precedence. In that case, we want systemd to disable the service.
This is essentially a revert of 304b3079a2
. It seems like systemd
*used* to do this, but it was changed to try to make the container
workflow a bit faster.
Resolves: https://github.com/coreos/fedora-coreos-tracker/issues/392
Co-authored-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
This commit is contained in:
parent
c1e0dc9c88
commit
93651582ae
@ -285,6 +285,8 @@ conf.set10('MEMORY_ACCOUNTING_DEFAULT', memory_accounting_
|
|||||||
conf.set('STATUS_UNIT_FORMAT_DEFAULT', 'STATUS_UNIT_FORMAT_' + status_unit_format_default.to_upper())
|
conf.set('STATUS_UNIT_FORMAT_DEFAULT', 'STATUS_UNIT_FORMAT_' + status_unit_format_default.to_upper())
|
||||||
conf.set_quoted('STATUS_UNIT_FORMAT_DEFAULT_STR', status_unit_format_default)
|
conf.set_quoted('STATUS_UNIT_FORMAT_DEFAULT_STR', status_unit_format_default)
|
||||||
|
|
||||||
|
conf.set10('FIRST_BOOT_FULL_PRESET', get_option('first-boot-full-preset'))
|
||||||
|
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
cc = meson.get_compiler('c')
|
cc = meson.get_compiler('c')
|
||||||
@ -4271,6 +4273,7 @@ foreach tuple : [
|
|||||||
['link-networkd-shared', get_option('link-networkd-shared')],
|
['link-networkd-shared', get_option('link-networkd-shared')],
|
||||||
['link-timesyncd-shared', get_option('link-timesyncd-shared')],
|
['link-timesyncd-shared', get_option('link-timesyncd-shared')],
|
||||||
['link-boot-shared', get_option('link-boot-shared')],
|
['link-boot-shared', get_option('link-boot-shared')],
|
||||||
|
['first-boot-full-preset'],
|
||||||
['fexecve'],
|
['fexecve'],
|
||||||
['standalone-binaries', get_option('standalone-binaries')],
|
['standalone-binaries', get_option('standalone-binaries')],
|
||||||
['coverage', get_option('b_coverage')],
|
['coverage', get_option('b_coverage')],
|
||||||
|
@ -27,6 +27,8 @@ option('link-timesyncd-shared', type: 'boolean',
|
|||||||
description : 'link systemd-timesyncd and its helpers to libsystemd-shared.so')
|
description : 'link systemd-timesyncd and its helpers to libsystemd-shared.so')
|
||||||
option('link-boot-shared', type: 'boolean',
|
option('link-boot-shared', type: 'boolean',
|
||||||
description : 'link bootctl and systemd-bless-boot against libsystemd-shared.so')
|
description : 'link bootctl and systemd-bless-boot against libsystemd-shared.so')
|
||||||
|
option('first-boot-full-preset', type: 'boolean', value: false,
|
||||||
|
description : 'during first boot, do full preset-all (default will be changed to true later)')
|
||||||
|
|
||||||
option('static-libsystemd', type : 'combo',
|
option('static-libsystemd', type : 'combo',
|
||||||
choices : ['false', 'true', 'pic', 'no-pic'],
|
choices : ['false', 'true', 'pic', 'no-pic'],
|
||||||
|
@ -1728,7 +1728,9 @@ static void manager_preset_all(Manager *m) {
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
/* If this is the first boot, and we are in the host system, then preset everything */
|
/* If this is the first boot, and we are in the host system, then preset everything */
|
||||||
r = unit_file_preset_all(LOOKUP_SCOPE_SYSTEM, 0, NULL, UNIT_FILE_PRESET_ENABLE_ONLY, NULL, 0);
|
UnitFilePresetMode mode = FIRST_BOOT_FULL_PRESET ? UNIT_FILE_PRESET_FULL : UNIT_FILE_PRESET_ENABLE_ONLY;
|
||||||
|
|
||||||
|
r = unit_file_preset_all(LOOKUP_SCOPE_SYSTEM, 0, NULL, mode, NULL, 0);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
log_full_errno(r == -EEXIST ? LOG_NOTICE : LOG_WARNING, r,
|
log_full_errno(r == -EEXIST ? LOG_NOTICE : LOG_WARNING, r,
|
||||||
"Failed to populate /etc with preset unit settings, ignoring: %m");
|
"Failed to populate /etc with preset unit settings, ignoring: %m");
|
||||||
|
Loading…
Reference in New Issue
Block a user