X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fdaemon.xml;h=a7217c84aafcdff1c7eb554f320121dc55c00f6b;hb=6edd7d0a09171ea5ae8e01b7b1cbcb0bdfbfeb16;hp=007ec95b97e96a82bba5980c8f98138494dbe184;hpb=6908d3842a3b69b90106646a16f51a6b089026bd;p=elogind.git
diff --git a/man/daemon.xml b/man/daemon.xml
index 007ec95b9..a7217c84a 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -8,16 +8,16 @@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
@@ -115,7 +115,7 @@
In the child, call
fork() again, to
- ensure the daemon can never re-aquire
+ ensure the daemon can never re-acquire
a terminal again.
Call exit() in the
@@ -323,7 +323,7 @@
Instead of using the
syslog() call to log directly to the
- system logger, a new-style daemon may
+ system syslog service, a new-style daemon may
choose to simply log to STDERR via
fprintf(), which is then forwarded to
syslog by the init system. If log
@@ -397,7 +397,7 @@
url="http://refspecs.freestandards.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB
Linux Standard Base Core
Specification. This method of
- activation is supported ubiquitiously on Linux
+ activation is supported ubiquitously on Linux
init systems, both old-style and new-style
systems. Among other issues SysV init scripts
have the disadvantage of involving shell
@@ -449,7 +449,7 @@
activation of daemons. However, the primary
advantage of this scheme is that all providers
and all consumers of the sockets can be
- started in parallel as soon als all sockets
+ started in parallel as soon as all sockets
are established. In addition to that daemons
can be restarted with losing only a minimal
number of client transactions or even any
@@ -644,7 +644,7 @@
to the CPU and IO schedulers. If a process
executed by the init system shall not
negatively impact the amount of CPU or IO
- bandwith available to other processes, it
+ bandwidth available to other processes, it
should be configured with
CPUSchedulingPolicy=idle
and/or
@@ -705,24 +705,6 @@
operating
system-independent.
- Since not all syslog
- implementations are socket-activatable
- yet, it is recommended to place an
- After=syslog.target
- dependency in service files for
- daemons that can log to
- syslog. syslog.target
- then either pulls in the syslog daemon
- itself or simply the activation
- socket. A Wants= or
- even Requires=
- dependency should generally not be
- added, since it should be up to the
- administrator whether he wants to
- enable logging or not, and most syslog
- clients work fine if no log daemon is
- running.
-
Make sure to include
an [Install]
section including installation
@@ -760,8 +742,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
@@ -785,15 +767,17 @@
AC_ARG_WITH([systemdsystemunitdir],
AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
[], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
-AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"])
+if test "x$with_systemdsystemunitdir" != xno; then
+ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+fi
+AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
This snippet allows automatic
installation of the unit files on systemd
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 an exercise for the
reader.)
Additionally, to ensure that
@@ -826,26 +810,29 @@ endif
%post
if [ $1 -eq 1 ]; then
- # Enable (but don't start) the units by default
+ # On install (not upgrade), enable (but don't start) the
+ # units by default
/bin/systemctl enable foobar.service foobar.socket >/dev/null 2>&1 || :
- # Alternatively, just call /bin/systemctl daemon-reload here,
- # if the daemon should not be enabled by default on package
+ # Alternatively, just call
+ # /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ # here, if the daemon should not be enabled by default on
# installation
fi
%preun
if [ $1 -eq 0 ]; then
- # Disable and stop the units
- /bin/systemctl disable foobar.service foobar.socket >/dev/null 2>&1 || :
+ # On uninstall (not upgrade), disable and stop the units
+ /bin/systemctl --no-reload disable foobar.service foobar.socket >/dev/null 2>&1 || :
/bin/systemctl stop foobar.service foobar.socket >/dev/null 2>&1 || :
fi
%postun
+# Reload init system configuration, to make systemd honour changed
+# or deleted unit files
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
- # On upgrade, reload init system configuration if we changed unit files
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
- # On upgrade, restart the daemon
+ # On upgrade (not uninstall), optionally, restart the daemon
/bin/systemctl try-restart foobar.service >/dev/null 2>&1 || :
fi
@@ -863,9 +850,9 @@ fi
script and a native systemd service file, use
a fragment like the following:
- %triggerin -- foobar < 0.47.11-1
-if /sbin/chkconfig foobar ; then
- /bin/systemctl enable foobar.service foobar.socket >/dev/null 2>&1 || :
+ %triggerun -- foobar < 0.47.11-1
+if /sbin/chkconfig --level 5 foobar ; then
+ /bin/systemctl --no-reload enable foobar.service foobar.socket >/dev/null 2>&1 || :
fi
Where 0.47.11-1 is the first package
@@ -873,10 +860,10 @@ fi
file. This fragment will ensure that the first
time the unit file is installed it will be
enabled if and only if the SysV init script is
- enabled, thus making sure that the the enable
+ enabled, thus making sure that the enable
status is not changed. Note that
chkconfig is a command
- specific Fedora which can be used to check
+ specific to Fedora which can be used to check
whether a SysV init script is enabled. Other
operating systems will have to use different
commands here.