From 4f5e972279d9ee6192930a0392f49cae9ad45daa Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 30 Mar 2017 11:54:23 +0200 Subject: [PATCH 1/2] README: document that gperf 3.1 is required for building now --- NEWS | 3 +++ README | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 9687bb81a9..f177ca31e6 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ systemd System and Service Manager CHANGES WITH 233: + * This version requires at least gperf 3.1 for building, 3.0 is not + sufficient. + * The "hybrid" control group mode has been modified to improve compatibility with "legacy" cgroups-v1 setups. Specifically, the "hybrid" setup of /sys/fs/cgroup is now pretty much identical to diff --git a/README b/README index 30b5f71876..260668c8db 100644 --- a/README +++ b/README @@ -165,7 +165,7 @@ REQUIREMENTS: autoconf libtool intltool - gperf + gperf >= 3.1 python (optional) python-lxml (optional, but required to build the indices) From b493bdafa951b35e33919bdc7f81da3b0e210a0d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 30 Mar 2017 11:54:45 +0200 Subject: [PATCH 2/2] man: use for all unit entries So far, all sections of the systemd.special(7) man page used for listing the targets, with one exception: the "Special Passive User Units" one. Let's clean this up and use the same formatting everywhere. --- man/systemd.special.xml | 84 +++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 45 deletions(-) diff --git a/man/systemd.special.xml b/man/systemd.special.xml index fa3dc1c5d4..66c45e39a3 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.xml @@ -901,64 +901,58 @@ Special Passive User Units - - graphical-session.target + + + graphical-session.target + + This target is active whenever any graphical session is running. It is used to stop user services which + only apply to a graphical (X, Wayland, etc.) session when the session is terminated. Such services should + have PartOf=graphical-session.target in their [Unit] section. A target + for a particular session (e. g. gnome-session.target) starts and stops + graphical-session.target with BindsTo=graphical-session.target. - This target is active whenever any graphical session is running. It - is used to stop user services which only apply to a graphical (X, - Wayland, etc.) session when the session is terminated. Such services - should have PartOf=graphical-session.target in their - [Unit] section. A target for a particular session - (e. g. gnome-session.target) starts and stops - graphical-session.target with - BindsTo=graphical-session.target. + Which services are started by a session target is determined by the Wants= and + Requires= dependencies. For services that can be enabled independently, symlinks in + .wants/ and .requires/ should be used, see + systemd.unit5. Those + symlinks should either be shipped in packages, or should be added dynamically after installation, for example + using systemctl add-wants, see + systemctl1. + - Which services are started by a session target is determined by the - Wants= and Requires= dependencies. - For services that can be enabled independently, symlinks in - .wants/ and .requires/ should be - used, see - systemd.unit5. - Those symlinks should either be shipped in packages, or should be added - dynamically after installation, for example using systemctl add-wants, see - systemctl1. - + + Nautilus as part of a GNOME session - - Nautilus as part of a GNOME session + gnome-session.target pulls in Nautilus as top-level service: - gnome-session.target pulls in Nautilus as - top-level service: - - [Unit] + [Unit] Description=User systemd services for GNOME graphical session Wants=nautilus.service -BindsTo=graphical-session.target - +BindsTo=graphical-session.target - nautilus.service gets stopped when the session stops: + nautilus.service gets stopped when the session stops: - [Unit] + [Unit] Description=Render the desktop icons with Nautilus PartOf=graphical-session.target [Service] -… - - - +… + + + - - graphical-session-pre.target - - This target contains services which set up the environment or - global configuration of a graphical session, such as SSH/GPG agents - (which need to export an environment variable into all desktop processes) - or migration of obsolete d-conf keys after an OS upgrade (which needs to - happen before starting any process that might use them). This target must - be started before starting a graphical session - like gnome-session.target. - + + graphical-session-pre.target + + This target contains services which set up the environment or global configuration of a graphical + session, such as SSH/GPG agents (which need to export an environment variable into all desktop processes) or + migration of obsolete d-conf keys after an OS upgrade (which needs to happen before starting any process that + might use them). This target must be started before starting a graphical session like + gnome-session.target. + + +