X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fdaemon.xml;h=46988ef5ec14607ed286bc3a7e517492bd8808a0;hp=fdc6a64eeaa15f05dfd42b8772fff7b86ce64f8b;hb=525ee6f4a1639bcb28198bf9e32b93ca2bfd268b;hpb=20604ebc04ce5d3b7d7d63e79f94cf0febf851c5

diff --git a/man/daemon.xml b/man/daemon.xml
index fdc6a64ee..46988ef5e 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -785,8 +785,10 @@
 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"])</programlisting>
+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 ])</programlisting>
 
                         <para>This snippet allows automatic
                         installation of the unit files on systemd
@@ -826,7 +828,7 @@ endif</programlisting>
 
                         <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,
@@ -836,16 +838,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>&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
-        # 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>
 
@@ -863,7 +865,7 @@ fi</programlisting>
                         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>