From af2d49f70bcff20efaf2d69aecaf4b3e898ff1fa Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 15 Nov 2010 22:12:41 +0100 Subject: drop support for MANAGER_SESSION, introduce MANAGER_USER instead --- man/daemon.xml | 6 +++--- man/systemadm.xml | 8 +++---- man/systemctl.xml | 24 ++++++++++----------- man/systemd.conf.xml | 17 +++++++++++++-- man/systemd.special.xml.in | 20 ++++++++--------- man/systemd.xml | 53 +++++++++++++++++++++++++++------------------- 6 files changed, 75 insertions(+), 53 deletions(-) (limited to 'man') diff --git a/man/daemon.xml b/man/daemon.xml index 42a7ffd8bb..f592e7d6e2 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -760,8 +760,8 @@ --variable=systemdsystemunitdir (for system services), resp. pkg-config systemd - --variable=systemdsessionunitdir - (for session services). This will make the + --variable=systemduserunitdir + (for user services). This will make the services available in the system on explicit request but not activate them automatically during boot. Optionally, during package @@ -795,7 +795,7 @@ AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_sy machines, and optionally allows their installation even on machines lacking systemd. (Modification of this snippet for the - session unit directory is left as excercise to the + user unit directory is left as excercise to the reader.) Additionally, to ensure that diff --git a/man/systemadm.xml b/man/systemadm.xml index 1377b18c2c..cefc300981 100644 --- a/man/systemadm.xml +++ b/man/systemadm.xml @@ -45,7 +45,7 @@ systemadm Graphical frontend for the systemd system - and session manager + and service manager @@ -58,7 +58,7 @@ Description systemadm is a graphical - frontend for the systemd system and session manager + frontend for the systemd system and service manager and allows introspection and control of systemd. @@ -87,10 +87,10 @@ - + Connect to the systemd - session manager of the calling + manager of the calling user. diff --git a/man/systemctl.xml b/man/systemctl.xml index 10e0f82441..844d218877 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -44,7 +44,7 @@ systemctl - Control the systemd system and session manager + Control the systemd system and service manager @@ -59,7 +59,7 @@ systemctl may be used to introspect and control the state of the systemd1 - system and session manager. + system and service manager. @@ -178,10 +178,10 @@ - + Talk to the systemd - session manager of the calling user. + manager of the calling user. @@ -224,10 +224,10 @@ When used with enable and disable, operate on the - global session configuĊ•ation + global user configuĊ•ation directory, thus enabling or disabling a unit file globally for all future - sessions of all users. + logins of all users. @@ -598,11 +598,11 @@ Depending on whether , - or + or is specified this enables the unit for the system, - for sessions of the calling user only - or for all future session of all + for the calling user only + or for all future logins of all users. Note that in the latter case no systemd daemon configuration is reloaded. @@ -643,7 +643,7 @@ This command honours , - , + , in a similar way as enable. @@ -942,9 +942,9 @@ Ask the systemd manager to quit. This is only - supported for session managers + supported for user service managers (i.e. in conjunction with the - option) and + option) and will fail otherwise. diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml index 399cae0a6c..6759f97814 100644 --- a/man/systemd.conf.xml +++ b/man/systemd.conf.xml @@ -49,7 +49,7 @@ system.conf - session.conf + user.conf @@ -57,7 +57,7 @@ When run as system instance systemd reads the configuration file system.conf, - otherwise session.conf. These + otherwise user.conf. These configuration files contain a few settings controlling basic manager operations. @@ -79,6 +79,7 @@ DumpCore=yes CrashShell=no ShowStatus=yes + SysVConsole=yes CrashChVT=1 Configures various @@ -99,6 +100,18 @@ process. Takes a space-separated list of CPU indexes. + + + MountAuto=yes + SwapAuto=yes + + Configures whether + systemd should automatically activate + all swap or mounts listed in + /etc/fstab, or + whether this job is left to some other + system script. + diff --git a/man/systemd.special.xml.in b/man/systemd.special.xml.in index 2855f6a25f..afe882e51f 100644 --- a/man/systemd.special.xml.in +++ b/man/systemd.special.xml.in @@ -698,9 +698,9 @@ - Special Session Units + Special User Units - When systemd runs as a service instance, the + When systemd runs as a user instance, the following special units are available, which have similar definitions as their system counterparts: default.target, @@ -719,22 +719,22 @@ A special service unit for shutting down the - session. + user service manager. Applications wanting to - terminate the session should - start this unit. If systemd - receives SIGTERM or SIGINT - when running as session daemon - it will start this - unit. + terminate the user service + manager should start this + unit. If systemd receives + SIGTERM or SIGINT when running + as user service daemon it will + start this unit. Normally, this pulls in shutdown.target which in turn should be conflicted by all units that want to be shut down on - session exit. + user service manager exit. diff --git a/man/systemd.xml b/man/systemd.xml index f434bfcc58..c6c06e57e9 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -45,7 +45,7 @@ systemd init - systemd System and Session Manager + systemd System and Service Manager @@ -60,7 +60,7 @@ Description - systemd is a system and session manager for + systemd is a system and service manager for Linux operating systems. When run as first process on boot (as PID 1), it acts as init system that brings up and maintains userspace services. @@ -77,7 +77,7 @@ When run as system instance, systemd interprets the configuration file system.conf, otherwise - session.conf. See + user.conf. See systemd.conf5 for more information. @@ -136,10 +136,10 @@ - + Tell systemd to run a - system instance (resp. session + system instance (resp. user instance), even if the process ID is not 1 (resp. is 1), i.e. systemd is not (resp. is) run as init process. @@ -159,27 +159,36 @@ - Dump core on crash. This switch has no effect when run as session instance. + Dump core on + crash. This switch has no effect when + run as user + instance. - Run shell on crash. This switch has no effect when run as session instance. + Run shell on + crash. This switch has no effect when + run as user + instance. - Ask for confirmation when spawning processes. This switch has no effect when run as session instance. + Ask for confirmation + when spawning processes. This switch + has no effect when run as user + instance. Show terse service status information while booting. This - switch has no effect when run as - session instance. Takes a boolean - argument which may be omitted - which is interpreted as + switch has no effect when run as user + instance. Takes a boolean argument + which may be omitted which is + interpreted as . @@ -188,7 +197,7 @@ Controls whether output of SysV init scripts will be directed to the console. This switch - has no effect when run as session + has no effect when run as user instance. Takes a boolean argument which may be omitted which is interpreted as @@ -489,10 +498,10 @@ - Session unit directories + User unit directories Similar rules apply - for the session unit + for the user unit directories. However, here the XDG Base Directory specification @@ -500,11 +509,11 @@ units. Applications should place their unit files in the directory returned by pkg-config systemd - --variable=systemdsessionunitdir. Global + --variable=systemduserunitdir. Global configuration is done in the directory reported by pkg-config systemd - --variable=systemdsessionconfdir. The + --variable=systemduserconfdir. The enable and disable commands of the @@ -565,12 +574,12 @@ to systemctl daemon-reexec. - systemd session managers will + systemd user managers will start the exit.target unit when this signal is received. This is mostly equivalent to - systemctl --session start + systemctl --user start exit.target. @@ -585,7 +594,7 @@ systemctl start ctl-alt-del.target. - systemd session managers + systemd user managers treat this signal the same way as SIGTERM. @@ -602,7 +611,7 @@ kbrequest.target. This signal is ignored by - systemd session + systemd user managers. @@ -757,7 +766,7 @@ $XDG_DATA_HOME $XDG_DATA_DIRS - The systemd session + The systemd user manager uses these variables in accordance to the XDG -- cgit v1.2.3-54-g00ecf