X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fdaemon.xml;h=de362c1b71466f754a5a4473079f6357bd617af7;hp=997ee5b2534d0e9663fa78b78cb3196cacbacaf3;hb=909f413d3c572baadf9b13e36e1e90beba42af86;hpb=4b7b2efb69943aae0f8287df6e28b637c50fe318 diff --git a/man/daemon.xml b/man/daemon.xml index 997ee5b25..de362c1b7 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 . --> @@ -44,7 +44,7 @@ daemon - Writing and Packaging System Daemons + Writing and packaging system daemons @@ -122,7 +122,7 @@ first child, so that only the second child (the actual daemon process) stays around. This ensures that the - daemon process is reparented to + daemon process is re-parented to init/PID 1, as all daemons should be. @@ -181,11 +181,11 @@ exit() in the original process. The process that invoked the daemon must be able to - rely that this + rely on that this exit() happens after initialization is complete and all external communication channels - established and + are established and accessible. @@ -196,7 +196,7 @@ compatibility with SysV systems should implement the scheme pointed out above. However, it is recommended to make this - behaviour optional and configurable via a + behavior optional and configurable via a command line argument, to ease debugging as well as to simplify integration into systems using systemd. @@ -271,7 +271,7 @@ for details. As much as possible, - rely on the init systemd's + rely on the init system's functionality to limit the access of the daemon to files, services and other resources. i.e. in the case of @@ -345,7 +345,7 @@ StandardError=syslog in the service unit file. For details see - sd-daemon7 + sd-daemon3 and systemd.exec5. @@ -462,13 +462,13 @@ New-style daemons which support socket activation must be able to receive their - sockets from the init system, instead of of + sockets from the init system, instead of creating and binding them themselves. For details about the programming interfaces for this scheme provided by systemd see sd_listen_fds3 and - sd-daemon7. For + sd-daemon3. For details about porting existing daemons to socket-based activation see below. With minimal effort it is possible to implement @@ -547,7 +547,7 @@ systemd, kernel devices appearing in the sysfs/udev device tree can be exposed as units if they are tagged with the string - "systemd". Like any other + systemd. Like any other kind of unit they may then pull in other units when activated (i.e. Plugged in) and thus implement device-based activation. Systemd @@ -740,7 +740,7 @@ directory returned by pkg-config systemd --variable=systemdsystemunitdir (for - system services), resp. pkg-config + system services) or pkg-config systemd --variable=systemduserunitdir (for user services). This will make the @@ -801,48 +801,49 @@ endif In the rpm8 - .spec file use a snippet like - the following to enable/disable the service - during installation/deinstallation. Consult + .spec file use snippets + like the following to enable/disable the + service during + installation/deinstallation. This makes use of + the RPM macros shipped along systemd. Consult the packaging guidelines of your distribution for details and the equivalent for other - package managers: + package managers. + + At the top of the file: + + BuildRequires: systemd +%{?systemd_requires} + + And as scriptlets, further down: %post -if [ $1 -eq 1 ]; then - # 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 >/dev/null 2>&1 || : - # here, if the daemon should not be enabled by default on - # installation -fi +%systemd_post foobar.service foobar.socket %preun -if [ $1 -eq 0 ]; then - # 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 +%systemd_preun foobar.service foobar.socket %postun -# 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 - # On upgrade (not uninstall), optionally, restart the daemon - /bin/systemctl try-restart foobar.service >/dev/null 2>&1 || : -fi - - Depending on whether your service should - or should not be started/stopped/restarted - during package installation, deinstallation or - upgrade, a different set of commands may be - specified. See - systemctl1 - for details. +%systemd_postun + + If the service shall be restarted during + upgrades replace the + %postun scriptlet above + with the following: + + %postun +%systemd_postun_with_restart foobar.service + + Note that + %systemd_post and + %systemd_preun expect the + names of all units that are installed/removed + as arguments, separated by + spaces. %systemd_postun + expects no + arguments. %systemd_postun_with_restart + expects the units to restart as + arguments. To facilitate upgrades from a package version that shipped only SysV init scripts to @@ -904,7 +905,7 @@ fi sd_listen_fds() returns a positive value), skip the socket creation step and use the passed sockets. Secondly, ensure - that the file-system socket nodes for local + that the file system socket nodes for local AF_UNIX sockets used in the socket-based activation are not removed when the daemon shuts down, if sockets have been @@ -937,7 +938,7 @@ fi See Also systemd1, - sd-daemon7, + sd-daemon3, sd_listen_fds3, sd_notify3, daemon3,