X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fdaemon.xml;h=ab355cd59374dc07bb77c49bed3aea0cf61563dd;hb=ed1c99fcc13f279eccf25fc20427eb92867da245;hp=46988ef5ec14607ed286bc3a7e517492bd8808a0;hpb=20ed3656786a36f58a27901356e67d03cdd6de5e;p=elogind.git
diff --git a/man/daemon.xml b/man/daemon.xml
index 46988ef5e..ab355cd59 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -115,7 +115,7 @@
In the child, call
fork() again, to
- ensure the daemon can never re-aquire
+ ensure the daemon can never re-acquire
a terminal again.
Call exit() in the
@@ -644,7 +644,7 @@
to the CPU and IO schedulers. If a process
executed by the init system shall not
negatively impact the amount of CPU or IO
- bandwith available to other processes, it
+ bandwidth available to other processes, it
should be configured with
CPUSchedulingPolicy=idle
and/or
@@ -760,8 +760,8 @@
--variable=systemdsystemunitdir (for
system services), resp. pkg-config
systemd
- --variable=systemdsessionunitdir
- (for session services). This will make the
+ --variable=systemduserunitdir
+ (for user services). This will make the
services available in the system on explicit
request but not activate them automatically
during boot. Optionally, during package
@@ -795,7 +795,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
- session unit directory is left as excercise to the
+ user unit directory is left as excercise to the
reader.)
Additionally, to ensure that
@@ -828,26 +828,29 @@ endif
%post
if [ $1 -eq 1 ]; then
- # On install, enable (but don't start) the units by default
+ # 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 here,
- # if the daemon should not be enabled by default on package
+ # Alternatively, just call
+ # /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ # here, if the daemon should not be enabled by default on
# installation
fi
%preun
if [ $1 -eq 0 ]; then
- # On uninstall, disable and stop the units
- /bin/systemctl disable foobar.service foobar.socket >/dev/null 2>&1 || :
+ # 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
%postun
-# On upgrade and uninstall, reload init system configuration, to make systemd honour changed unit files
+# 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
- # Optionally, on upgrade, restart the daemon
+ # On upgrade (not uninstall), optionally, restart the daemon
/bin/systemctl try-restart foobar.service >/dev/null 2>&1 || :
fi
@@ -866,8 +869,8 @@ fi
a fragment like the following:
%triggerun -- foobar < 0.47.11-1
-if /sbin/chkconfig foobar ; then
- /bin/systemctl enable foobar.service foobar.socket >/dev/null 2>&1 || :
+if /sbin/chkconfig --level 3 foobar ; then
+ /bin/systemctl --no-reload enable foobar.service foobar.socket >/dev/null 2>&1 || :
fi
Where 0.47.11-1 is the first package