units: properly terminate readahead collection 10s after boot

[elogind.git] / man / daemon.xml

diff --git a/man/daemon.xml b/man/daemon.xml
index b8e9df4900bcbd7c1b84135b0e460a695daf61e9..dac244ca4e8abbfd4459d36fbd2b72cefd2927be 100644 (file)
--- 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
                         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
                         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</programlisting>
 
                         <programlisting>%post
 if [ $1 -eq 1 ]; then
 
                         <programlisting>%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>&amp;1 || :
 
         # Alternatively, just call /bin/systemctl daemon-reload here,
         /bin/systemctl enable foobar.service foobar.socket >/dev/null 2>&amp;1 || :
 
         # Alternatively, just call /bin/systemctl daemon-reload here,


@@ -836,16 +836,16 @@ fi
 
 %preun
 if [ $1 -eq 0 ]; then
 
 %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>&amp;1 || :
         /bin/systemctl stop foobar.service foobar.socket >/dev/null 2>&amp;1 || :
 fi
 
 %postun
         /bin/systemctl disable foobar.service foobar.socket >/dev/null 2>&amp;1 || :
         /bin/systemctl stop foobar.service foobar.socket >/dev/null 2>&amp;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>&amp;1 || :

 if [ $1 -ge 1 ] ; then
 if [ $1 -ge 1 ] ; then

-        # On upgrade, reload init system configuration if we changed unit files
-        /bin/systemctl daemon-reload >/dev/null 2>&amp;1 || :
-        # On upgrade, restart the daemon
+        # Optionally, on upgrade, restart the daemon

         /bin/systemctl try-restart foobar.service >/dev/null 2>&amp;1 || :
 fi</programlisting>
 
         /bin/systemctl try-restart foobar.service >/dev/null 2>&amp;1 || :
 fi</programlisting>
 


@@ -863,7 +863,7 @@ fi</programlisting>
                         script and a native systemd service file, use
                         a fragment like the following:</para>
 
                         script and a native systemd service file, use
                         a fragment like the following:</para>
 

-                        <programlisting>%triggerin -- foobar &lt; 0.47.11-1
+                        <programlisting>%triggerun -- foobar &lt; 0.47.11-1

 if /sbin/chkconfig foobar ; then
         /bin/systemctl enable foobar.service foobar.socket >/dev/null 2>&amp;1 || :
 fi</programlisting>
 if /sbin/chkconfig foobar ; then
         /bin/systemctl enable foobar.service foobar.socket >/dev/null 2>&amp;1 || :
 fi</programlisting>