X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fdaemon.xml;h=a7217c84aafcdff1c7eb554f320121dc55c00f6b;hb=8f33b5b8b3e85f9c3b00eb004e601f7a72fa6461;hp=42a7ffd8bb1d02f8193e27a7f26da25d7ad462b2;hpb=b772cfe0cccbcb52d6c4fc0a51cf9dfb39ecc3be;p=elogind.git
diff --git a/man/daemon.xml b/man/daemon.xml
index 42a7ffd8b..a7217c84a 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 .
-->
@@ -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
@@ -323,7 +323,7 @@
Instead of using the
syslog() call to log directly to the
- system logger, a new-style daemon may
+ system syslog service, a new-style daemon may
choose to simply log to STDERR via
fprintf(), which is then forwarded to
syslog by the init system. If log
@@ -397,7 +397,7 @@
url="http://refspecs.freestandards.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB
Linux Standard Base Core
Specification. This method of
- activation is supported ubiquitiously on Linux
+ activation is supported ubiquitously on Linux
init systems, both old-style and new-style
systems. Among other issues SysV init scripts
have the disadvantage of involving shell
@@ -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
@@ -705,24 +705,6 @@
operating
system-independent.
- Since not all syslog
- implementations are socket-activatable
- yet, it is recommended to place an
- After=syslog.target
- dependency in service files for
- daemons that can log to
- syslog. syslog.target
- then either pulls in the syslog daemon
- itself or simply the activation
- socket. A Wants= or
- even Requires=
- dependency should generally not be
- added, since it should be up to the
- administrator whether he wants to
- enable logging or not, and most syslog
- clients work fine if no log daemon is
- running.
-
Make sure to include
an [Install]
section including installation
@@ -760,8 +742,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 +777,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 an exercise for the
reader.)
Additionally, to ensure that
@@ -841,7 +823,7 @@ fi
%preun
if [ $1 -eq 0 ]; then
# On uninstall (not upgrade), disable and stop the units
- /bin/systemctl disable foobar.service foobar.socket >/dev/null 2>&1 || :
+ /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
@@ -869,8 +851,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 5 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