X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fdaemon.xml;h=66e198abbc404214577a8b582f652ad5cee03685;hb=5b6a2c5aab9893ba82acf90696f83e4d48db2b19;hp=997ee5b2534d0e9663fa78b78cb3196cacbacaf3;hpb=4b7b2efb69943aae0f8287df6e28b637c50fe318;p=elogind.git
diff --git a/man/daemon.xml b/man/daemon.xml
index 997ee5b25..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 .
-->
@@ -801,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