diff --git a/docs/PORTABILITY_AND_STABILITY.md b/docs/PORTABILITY_AND_STABILITY.md
index 0caa5cc0484..27562c17d8f 100644
--- a/docs/PORTABILITY_AND_STABILITY.md
+++ b/docs/PORTABILITY_AND_STABILITY.md
@@ -120,7 +120,7 @@ And now, here's the list of (hopefully) all APIs that we have introduced with sy
| `/run` | File hierarchy change | yes | yes | numerous | yes | OpenSUSE, Debian, ArchLinux | no |
| [Generators](https://www.freedesktop.org/software/systemd/man/systemd.generator.html) | Subprocess | yes | yes | - | no | - | no |
| [System Updates](https://www.freedesktop.org/software/systemd/man/systemd.offline-updates.html) | System Mode | yes | yes | - | no | - | no |
-| [Presets](https://freedesktop.org/wiki/Software/systemd/Preset) | File format | yes | yes | - | no | - | no |
+| [Presets](https://www.freedesktop.org/software/systemd/man/systemd.preset.html) | File format | yes | yes | - | no | - | no |
| Udev rules | File format | yes | yes | numerous | no | no | partially |
diff --git a/man/systemctl.xml b/man/systemctl.xml
index e49a12a146e..db4e2b2c65c 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -793,9 +793,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
For more information on the preset policy format, see
systemd.preset5.
- For more information on the concept of presets, please consult the
- Preset
- document.
+
diff --git a/man/systemd.preset.xml b/man/systemd.preset.xml
index 5697e50be7c..cbd89daf162 100644
--- a/man/systemd.preset.xml
+++ b/man/systemd.preset.xml
@@ -32,28 +32,20 @@
Description
- Preset files may be used to encode policy which units shall
- be enabled by default and which ones shall be disabled. They are
- read by systemctl preset (for more information
- see
- systemctl1)
- which uses this information to enable or disable a unit according
- to preset policy. systemctl preset is used by
- the post install scriptlets of RPM packages (or other OS package
- formats), to enable/disable specific units by default on package
- installation, enforcing distribution, spin or administrator preset
- policy. This allows choosing a certain set of units to be
- enabled/disabled even before installing the actual package.
+ Preset files may be used to encode policy which units shall be enabled by default and which ones
+ shall be disabled. They are read by systemctl preset which uses this information to
+ enable or disable a unit. Depending on that policy, systemctl preset is identical to
+ systemctl enable or systemctl disable.
- For more information on the preset logic please have a look
- at the Presets
- document.
+ systemctl preset is used by the post install scriptlets of rpm packages (or other OS
+ package formats), to enable/disable specific units by default on package installation, enforcing
+ distribution, spin or administrator preset policy. This allows choosing a certain set of units to be
+ enabled/disabled even before installing the actual package. For more information, see
+ systemctl1.
- It is not recommended to ship preset files within the
- respective software packages implementing the units, but rather
- centralize them in a distribution or spin default policy, which
- can be amended by administrator policy.
+ It is not recommended to ship preset files within the respective software packages implementing the
+ units, but rather centralize them in a distribution or spin default policy, which can be amended by
+ administrator policy, see below.
If no preset files exist, systemctl
preset will enable all units that are installed by
@@ -175,6 +167,38 @@ disable *
override all other preset policy files.
+
+ Motiviation for the preset logic
+
+ Different distributions have different policies on which services shall be enabled by default when
+ the package they are shipped in is installed. On Fedora all services stay off by default, so that
+ installing a package will not cause a service to be enabled (with some exceptions). On Debian all
+ services are immediately enabled by default, so that installing a package will cause its services to be
+ enabled right-away.
+
+ Even within a single distribution, different spins (flavours, remixes, whatever you might want to
+ call them) of a distribution also have different policies on what services to enable, and what services
+ to leave off. For example, Fedora Workstation will enable gdm as display manager by
+ default, while the Fedora KDE spin will enable sddm instead.
+
+ Different sites might also have different policies what to turn on by default and what to turn
+ off. For example, one administrator would prefer to enforce the policy of "sshd should
+ be always on, but everything else off", while another one might say "snmpd always on,
+ and for everything else use the distribution policy defaults".
+
+ Traditionally, policy about which services shall be enabled were implemented in each package
+ individually. This made it cumbersome to implement different policies per spin or per site, or to create
+ software packages that do the right thing on more than one distribution. The enablement mechanism was
+ also encoding the enablement policy.
+
+ The preset mechanism allows clean separation of the enablement mechanism (inside the package
+ scriptlets, by invoking systemctl preset) and enablement policy (centralized in the
+ preset files), and lifts the configuration out of individual packages. Preset files may be written for
+ specific distributions, for specific spins or for specific sites, in order to enforce different policies
+ as needed. It is recommended to apply the policy encoded in preset files in package installation
+ scriptlets.
+
+
See Also
@@ -182,6 +206,13 @@ disable *
systemctl1,
systemd-delta1
+
+ daemon8
+ has a discussion of packaging scriptlets.
+
+ Fedora page introducing the use of presets:
+ Features/PackagePresets.
+
diff --git a/meson.build b/meson.build
index 0af0cce8b85..01eeeb750e5 100644
--- a/meson.build
+++ b/meson.build
@@ -1450,14 +1450,6 @@ have = have and conf.get('HAVE_PAM') == 1
conf.set10('ENABLE_PAM_HOME', have)
have = get_option('oomd')
-if have == 'auto'
- have = get_option('mode') == 'developer'
-else
- have = have == 'true'
- if have and get_option('mode') != 'developer'
- warning('oomd is not ready for release mode (yet)')
- endif
-endif
conf.set10('ENABLE_OOMD', have)
substs.set10('ENABLE_OOMD', have)
@@ -3668,8 +3660,8 @@ status = [
conf.get('SYSTEM_ALLOC_UID_MIN')),
'system GIDs: <=@0@ (alloc >=@1@)'.format(conf.get('SYSTEM_GID_MAX'),
conf.get('SYSTEM_ALLOC_GID_MIN')),
- 'dynamic UIDs: @0@–@1@'.format(dynamic_uid_min, dynamic_uid_max),
- 'container UID bases: @0@–@1@'.format(container_uid_base_min, container_uid_base_max),
+ 'dynamic UIDs: @0@…@1@'.format(dynamic_uid_min, dynamic_uid_max),
+ 'container UID bases: @0@…@1@'.format(container_uid_base_min, container_uid_base_max),
'/dev/kvm access mode: @0@'.format(get_option('dev-kvm-mode')),
'render group access mode: @0@'.format(get_option('group-render-mode')),
'certificate root directory: @0@'.format(get_option('certificate-root')),
diff --git a/meson_options.txt b/meson_options.txt
index a4214730299..425e958ba20 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -99,7 +99,7 @@ option('coredump', type : 'boolean',
description : 'install the coredump handler')
option('pstore', type : 'boolean',
description : 'install the pstore archival tool')
-option('oomd', type : 'combo', choices : ['auto', 'true', 'false'],
+option('oomd', type : 'boolean',
description : 'install the userspace oom killer')
option('logind', type : 'boolean',
description : 'install the systemd-logind stack')
diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build
index 4117188f147..92ce23ecf91 100644
--- a/src/kernel-install/meson.build
+++ b/src/kernel-install/meson.build
@@ -4,8 +4,7 @@ want_kernel_install = get_option('kernel-install')
if want_kernel_install
install_data('kernel-install',
- install_mode : 'rwxr-xr-x',
- install_dir : bindir)
+ install_mode : 'rwxr-xr-x')
install_data('00-entry-directory.install',
'50-depmod.install',