X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fdaemon.xml;h=dac244ca4e8abbfd4459d36fbd2b72cefd2927be;hb=f21781d57f7e012c1d576dfd8c30b411014c5a88;hp=4afe712c714333c660093b164eb39a39d2574c41;hpb=485ccf9a5b68a540d1ee1e09b9dc1ca323b9c15e;p=elogind.git
diff --git a/man/daemon.xml b/man/daemon.xml
index 4afe712c7..dac244ca4 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -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
@@ -826,7 +826,7 @@ endif
%post
if [ $1 -eq 1 ]; then
- # Enable (but don't start) the units by default
+ # On install, 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,
@@ -836,16 +836,16 @@ fi
%preun
if [ $1 -eq 0 ]; then
- # Disable and stop the units
+ # On uninstall, disable and stop the units
/bin/systemctl disable foobar.service foobar.socket >/dev/null 2>&1 || :
/bin/systemctl stop foobar.service foobar.socket >/dev/null 2>&1 || :
fi
%postun
+# On upgrade and uninstall, reload init system configuration, to make systemd honour changed 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
+ # Optionally, on upgrade, restart the daemon
/bin/systemctl try-restart foobar.service >/dev/null 2>&1 || :
fi
@@ -863,7 +863,7 @@ fi
script and a native systemd service file, use
a fragment like the following:
- %triggerin -- foobar < 0.47.11-1
+ %triggerun -- foobar < 0.47.11-1
if /sbin/chkconfig foobar ; then
/bin/systemctl enable foobar.service foobar.socket >/dev/null 2>&1 || :
fi
@@ -873,7 +873,7 @@ 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 to Fedora which can be used to check