X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fdaemon.xml;h=66e198abbc404214577a8b582f652ad5cee03685;hb=e156d769c3ee756cdb20f8522ace9ea459a82655;hp=ea0e6d27f58f665045fe761b1a909e0edd6390a1;hpb=d12d0e647a0bf83581e2dba4281a5b93b5428886;p=elogind.git
diff --git a/man/daemon.xml b/man/daemon.xml
index ea0e6d27f..66e198abb 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 .
-->
@@ -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
@@ -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
@@ -795,7 +777,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
- user unit directory is left as excercise to the
+ user unit directory is left as an exercise for the
reader.)
Additionally, to ensure that
@@ -819,48 +801,49 @@ endif
In the
rpm8
- .spec file use a snippet like
- the following to enable/disable the service
- during installation/deinstallation. Consult
+ .spec file use snippets
+ like the following to enable/disable the
+ service during
+ installation/deinstallation. This makes use of
+ the RPM macros shipped along systemd. Consult
the packaging guidelines of your distribution
for details and the equivalent for other
- package managers:
+ package managers.
+
+ At the top of the file:
+
+ BuildRequires: systemd
+%{?systemd_requires}
+
+ And as scriptlets, further down:
%post
-if [ $1 -eq 1 ]; then
- # 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 >/dev/null 2>&1 || :
- # here, if the daemon should not be enabled by default on
- # installation
-fi
+%systemd_post foobar.service foobar.socket
%preun
-if [ $1 -eq 0 ]; then
- # 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
+%systemd_preun foobar.service foobar.socket
%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 (not uninstall), optionally, restart the daemon
- /bin/systemctl try-restart foobar.service >/dev/null 2>&1 || :
-fi
-
- Depending on whether your service should
- or should not be started/stopped/restarted
- during package installation, deinstallation or
- upgrade, a different set of commands may be
- specified. See
- systemctl1
- for details.
+%systemd_postun
+
+ If the service shall be restarted during
+ upgrades replace the
+ %postun scriptlet above
+ with the following:
+
+ %postun
+%systemd_postun_with_restart foobar.service
+
+ Note that
+ %systemd_post and
+ %systemd_preun expect the
+ names of all units that are installed/removed
+ as arguments, separated by
+ spaces. %systemd_postun
+ expects no
+ arguments. %systemd_postun_with_restart
+ expects the units to restart as
+ arguments.
To facilitate upgrades from a package
version that shipped only SysV init scripts to
@@ -869,7 +852,7 @@ fi
a fragment like the following:
%triggerun -- foobar < 0.47.11-1
-if /sbin/chkconfig foobar ; then
+if /sbin/chkconfig --level 5 foobar ; then
/bin/systemctl --no-reload enable foobar.service foobar.socket >/dev/null 2>&1 || :
fi