From 64aba792f7d2af56ba5308518a270490f85f3b8b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 22 Jun 2010 02:42:10 +0200 Subject: man: add initial version of daemon(7) --- man/daemon.xml | 316 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 316 insertions(+) create mode 100644 man/daemon.xml (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml new file mode 100644 index 0000000000..3d1e921a16 --- /dev/null +++ b/man/daemon.xml @@ -0,0 +1,316 @@ + + + + + + + + + daemon + systemd + + + + Developer + Lennart + Poettering + lennart@poettering.net + + + + + + daemon + 7 + + + + daemon + Writing and Packaging System Daemons + + + + Description + + A daemon is a service process that runs in the + background and supervises the system or provides + functionality to other processes. Traditionally, + daemons are implemented following a scheme originating + in SysV Unix. Modern daemons should follow a simpler + yet more powerful scheme here called "new-style" + daemons, as implemented by systemd. + + + SysV Daemons + + When a traditional SysV daemon + starts, it should execute the following steps + as part of the initialization. Note that these + steps are unnecessary for new-style daemons, + and should only be implemented if compatbility + with SysV is essential. + + + Close all open file + descriptors except STDIN, STDOUT, + STDERR (i.e. the first three file + descriptors 0, 1, 2). This ensures + that no accidentally passed file + descriptor stays around in the daemon + process. On Linux this is best + implemented by iterating through + /proc/self/fd, + with a fallback of iterating from file + descriptor 3 to the value returned by + getrlimit() for + RLIMIT_NOFILE. + + Reset all signal + handlers to their default. This is + best done by iterating through the + available signals up to the limit of + _NSIG and resetting them to + SIG_DFL. + + Reset the signal mask + using sigprocmask(). + + Call fork(), + to create a background + process. + + In the child, call + setsid() to detach from any terminal + and create an independent + session. + + In the child, call + fork() again, to ensure the daemon can + never re-aquire a terminal + again. + + Call exit() in the + first child, so that only the second + child (the actual daemon process) + stays around. This ensures that the + daemon process is reparented to + init/PID 1, as all daemons should + be. + + In the daemon process, + connect /dev/null + to STDIN, STDOUT, + STDERR. + + In the daemon process, + reset the umask to 0, so that the file + modes passed to open(), mkdir() and + suchlike directly control the access + mode of the created files and + directories. + + In the daemon process, + change the current directory to the + root directory (/), in order to avoid + that the daemon involuntarily + blocks mount points from being + unmounted. + + In the daemon process, + drop privileges, if possible and + applicable. + + From the daemon + process notify the original process + started that initialization is + complete. This can be implemented via + an unnamed pipe or similar + communication channel that is created + before the first fork() and available + in both processes. + + Call exit() in the + original process. The process that + invoked the daemon must be able to + rely that this exit() happens after + initialization is complete and all + external communication channels + established and + accessible. + + + The BSD daemon() function should not be + used, as it does only a subset of these steps. + + A daemon that needs to provide + compatibility with SysV systems should + implement the scheme pointed out + above. However, it is recommended to make this + behaviour optional and configurable via a + command line argument, to ease debugging as + well as to simplify integration into systems + using systemd. + + + + New-Style Daemons + + Modern services for Linux should be + implemented as new-style daemons. This makes it + easier to supervise and control them at + runtime and simplifies their + implementation. + + For developing a new-style daemon none + of the initialization steps recommended for + SysV daemons need to be implemented. New-style + init systems such as systemd make all of them + redundant. Moreover, since some of these steps + interfere with process monitoring, file + descriptor passing and other functionality of + the init system it is recommended not to + execute them when run as new-style + service. + + It is recommended for new-style daemons + to implement the following: + + + If SIGTERM is + received, shut down the daemon and + exit cleanly. + + If SIGHUP is received, + reload the configuration files, if + this applies. + + Provide a correct exit + code from the main daemon process, as + this is used by the init system to + detect service errors and problems. It + is recommended to follow the exit code + scheme as defined in LSB + recommendations for SysV init scripts + (http://refspecs.freestandards.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html). + + As much as possible, + rely on systemd's functionality to + limit the accces of the daemon to + files, services and other + resources. i.e. rely on systemd's + resource limit control instead of + implementing your own, rely on + systemd's privilege dropping code + instead of implementing it in the + daemon, and similar. + + If possible and + applicable expose the daemon's control + interface via the D-Bus IPC system and + grab a bus name as last step of + initialization. + + If D-Bus is used, make + your daemon bus-activatable, via + supplying a D-Bus service activation + configuration file. This has multiple + advantages: your daemon may be started + lazily on-demand; it may be started in + parallel to other daemons requiring it + -- which maximizes parallelization and + boot-up speed; your daemon can be + restarted on failure, without losing + any bus requests, as the bus queues + requests for activatable + services. + + If your daemon + provides services to other local + processes or remote clients via a + socket, it should be made + socket-activatable following the + scheme pointed out below. Like D-Bus + activation this enables on-demand + starting of services as well as it + allows improved parallization of + service start-up. Also, for state-less + protocols (such as syslog, DNS) a + daemon implementing socket-based + activation can be restarted without + losing a single + request. + + If applicable a daemon + should notify the init system about + startup completion or status + updates via the sd_notify() + interface. + + Instead of using the + syslog() call to log directly to the + system logger, 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 + priorities are necessary these can be + encoded by prefixing individual log + lines with strings like "<4>" + (for log priority 4 "WARNING" in the + syslog priority scheme), following a + similar style as the Linux kernel's + printk() priority system. In fact, using + this style of logging also enables the + init system to optionally direct all + application logging to the kernel log + buffer (kmsg), as accessible via + dmesg. + + + + + + Bus Activation + + + + Socket Activation + + + + Writing Service Files + + + + Installing Service Files + + + + + + + See Also + + daemon3, + sd_listen_fds3 + + + + -- cgit v1.2.3-54-g00ecf From 160cd5c9aa2301892e13950015de7968c764340d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 24 Jun 2010 00:11:04 +0200 Subject: man: add more man pages --- Makefile.am | 20 +++- man/daemon.xml | 11 +- man/halt.xml | 180 +++++++++++++++++++++++++++++ man/pam_systemd.xml | 296 ++++++++++++++++++++++++++++++++++++++++++++++++ man/runlevel.xml | 3 +- man/sd-daemon.xml | 2 +- man/sd_booted.xml | 4 +- man/sd_is_fifo.xml | 4 +- man/sd_listen_fds.xml | 4 +- man/sd_notify.xml | 2 +- man/shutdown.xml | 155 +++++++++++++++++++++++++ man/systemd-install.xml | 9 +- man/systemd.unit.xml | 26 ++--- man/systemd.xml | 31 ++++- man/telinit.xml | 194 +++++++++++++++++++++++++++++++ 15 files changed, 902 insertions(+), 39 deletions(-) create mode 100644 man/halt.xml create mode 100644 man/pam_systemd.xml create mode 100644 man/shutdown.xml create mode 100644 man/telinit.xml (limited to 'man/daemon.xml') diff --git a/Makefile.am b/Makefile.am index e41ba48e24..b650daba06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -308,14 +308,18 @@ dist_man_MANS = \ man/systemd.unit.5 \ man/systemd.service.5 \ man/daemon.7 \ - man/systemd.8 \ + man/systemd.1 \ man/sd_notify.3 \ man/sd_booted.3 \ man/sd_listen_fds.3 \ man/sd_is_fifo.3 \ man/sd-daemon.7 \ man/runlevel.8 \ - man/systemd-install.1 + man/telinit.8 \ + man/halt.8 \ + man/shutdown.8 \ + man/systemd-install.1 \ + man/pam_systemd.8 nodist_man_MANS = \ man/systemd.special.7 @@ -331,7 +335,11 @@ dist_noinst_DATA = \ man/sd_is_fifo.html \ man/sd-daemon.html \ man/runlevel.html \ - man/systemd-install.html + man/telinit.html \ + man/halt.html \ + man/shutdown.html \ + man/systemd-install.html \ + man/pam_systemd.html nodist_noinst_DATA = \ man/systemd.special.html @@ -350,7 +358,11 @@ EXTRA_DIST += \ man/sd_is_fifo.xml \ man/sd-daemon.xml \ man/runlevel.xml \ - man/systemd-install.xml + man/telinit.xml \ + man/halt.xml \ + man/shutdown.xml \ + man/systemd-install.xml \ + man/pam_systemd.xml systemd_SOURCES = \ src/main.c diff --git a/man/daemon.xml b/man/daemon.xml index 3d1e921a16..650e0fa8b1 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -306,11 +306,12 @@ - See Also - - daemon3, - sd_listen_fds3 - + See Also + + systemd1, + daemon3, + sd_listen_fds3 + diff --git a/man/halt.xml b/man/halt.xml new file mode 100644 index 0000000000..f07e04a7c4 --- /dev/null +++ b/man/halt.xml @@ -0,0 +1,180 @@ + + + + + + + + + halt + systemd + + + + Developer + Lennart + Poettering + lennart@poettering.net + + + + + + halt + 8 + + + + halt + poweroff + reboot + Halt, power-off or reboot the machine + + + + + halt OPTIONS + + + poweroff OPTIONS + + + reboot OPTIONS + + + + + Description + + halt, + poweroff, reboot + may be used to halt, power-off or reboot the + machine. + + + + + Options + + The following options are understood: + + + + + + Prints a short help + text and exits. + + + + + + Halt the machine, + regardless which one of the three + commands is invoked. + + + + + + + Power-off the machine, + regardless which one of the three + commands is invoked. + + + + + + Reboot the machine, + regardless which one of the three + commands is invoked. + + + + + + + Force immediate halt, + power-off, reboot. Don't contact the + init system. + + + + + + + Only write wtmp + shutdown entry, don't actually halt, + power-off, reboot. + + + + + + + Don't write wtmp + shutdown entry. + + + + + + + Don't sync hard disks/storage media before + halt, power-off, + reboot. + + + + + + Don't send wall + message before + halt, power-off, reboot. + + + + + + Exit status + + On success 0 is returned, a non-zero failure + code otherwise. + + + + Notes + + These are legacy commands available for + compatibility only. + + + + See Also + + systemd1, + systemctl1, + shutdown8 + + + + diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml new file mode 100644 index 0000000000..e790dd3c3d --- /dev/null +++ b/man/pam_systemd.xml @@ -0,0 +1,296 @@ + + + + + + + + + pam_systemd + systemd + + + + Developer + Lennart + Poettering + lennart@poettering.net + + + + + + pam_systemd + 8 + + + + pam_systemd + Register user sessions in the systemd control group hierarchy + + + + + pam_systemd.so + + + + + Description + + pam_systemd registers user + sessions in the systemd control group + hierarchy. + + On login, this module ensures the following: + + + If it does not exist yet the + user runtime directory + /var/run/user/$USER is + created and its ownership changed to the user + that is logging in. + + If + is set the + $XDG_SESSION_ID environment + variable is initialized. If auditing is + available and + pam_loginuid.so run before + this module (which es recommended), the + variable is initialized from the auditing + session id + (/proc/self/sessionid). Otherwise + an independent session counter is + used. + + If + is set a new + control group + /user/$USER/$XDG_SESSION_ID + is created and the login process moved into + it. + + If + is set a new + control group + /user/$USER/no-session + is created and the login process moved into + it. + + + + On logout, this module ensures the following: + + + If + $XDG_SESSION_ID is set and + specified, all + remaining processes in the + /user/$USER/$XDG_SESSION_ID + control group are killed and the control group + removed. + + If + $XDG_SESSION_ID is set and + specified, all + remaining processes in the + /user/$USER/$XDG_SESSION_ID + control group are migrated to + /user/$USER/no-session and + the original control group + removed. + + If + is specified, and + no other user session control group remains + except + /user/$USER/no-session + all remaining processes in the + /user/$USER hierarchy + are killed and the control group removed. + + If + is specified, and + no process remains in the + /user/$USER hierarchy the + control group is removed. + + If the + /user/$USER control group + was removed the + $XDG_RUNTIME_DIR directory + and all its contents are + removed, too. + + + If the system was not booted up with systemd as + init system this module does nothing and immediately + returns PAM_SUCCESS. + + + + + Options + + The following options are understood: + + + + + + Takes a boolean + argument. If true, a new session is + created: the + $XDG_SESSION_ID + environment variable is set and the + login process moved to the + /user/$USER/$XDG_SESSION_ID + control group. It is recommended that + all services that are directly created + on the user's behalf set this + option. Only for services that shall + automatically be terminated when the + user logs out completely otherwise, + create-session=0 + should be set. + + + + + + Takes a boolean + argument. If true, all processes + created by the user during his session + and from his session will be + terminated when he logs out from his + session. + + + + + + Takes a boolean + argument. If true, all processes + created by the user during his session + and from his session will be + terminated after he logged out + completely. This is a weaker version + of and is + more friendly for users logged in more + than once as their processes are + terminated only on their complete + logout. + + + + Note that setting kill-user=1 + or even kill-session=1 will break + tools like + screen1. + + + + + Module Types Provided + + Only is provided. + + + + Environment + + + + $XDG_SESSION_ID + + A session identifier, + suitable to be used in file names. The + string itself should be considered + opaque, although often it is just the + audit session ID as reported by + /proc/self/sessionid. Each + ID will be assigned only once during + machine uptime. It may hence be used + to uniquely label files or other + resources of this + session. + + + + $XDG_RUNTIME_DIR + + Path to a user-private + user-writable directory that is bound + to the user login time on the + machine. It is automatically created + the first time a user logs in and + removed on his final logout. If a user + logs in twice at the same time, both + sessions will see the same + $XDG_RUNTIME_DIR + and the same contents. If a user logs + in once, then logs out again, and logs + in again, the directory contents will + have been lost in between, but + applications should not rely on this + behaviour and must be able to deal with + stale files. To store session-private + data in this directory the user should + include the value of $XDG_SESSION_ID + in the filename. This directory shall + be used for runtime file system + objects such as AF_UNIX sockets, + FIFOs, PID files and similar. It is + guaranteed that this directory is + local and offers the greatest possible + file system feature set the + operating system + provides. + + + + + + Example + + #%PAM-1.0 +auth required pam_unix.so +auth required pam_nologin.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so +session required pam_loginuid.so +session required pam_systemd.so create-session=1 kill-user=1 + + + + See Also + + pam.conf5, + pam.d5, + pam8, + pam_loginuid8, + systemd1 + + + + diff --git a/man/runlevel.xml b/man/runlevel.xml index 71b6e3852d..04959b18a9 100644 --- a/man/runlevel.xml +++ b/man/runlevel.xml @@ -21,7 +21,7 @@ along with systemd; If not, see . --> - + runlevel @@ -146,6 +146,7 @@ See Also + systemd1, systemctl1 diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml index 2acc021041..da1e5b31bb 100644 --- a/man/sd-daemon.xml +++ b/man/sd-daemon.xml @@ -147,12 +147,12 @@ See Also + systemd1, sd_listen_fds3, sd_notify3, sd_booted3, sd_is_fifo3, daemon7, - systemd8, systemd.service5, systemd.socket5, fprintf3 diff --git a/man/sd_booted.xml b/man/sd_booted.xml index 6129a777c2..8d5606d79f 100644 --- a/man/sd_booted.xml +++ b/man/sd_booted.xml @@ -114,8 +114,8 @@ See Also - sd_daemon7, - systemd8 + systemd1, + sd_daemon7 diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml index 2389546130..f1f6d376ee 100644 --- a/man/sd_is_fifo.xml +++ b/man/sd_is_fifo.xml @@ -188,9 +188,9 @@ See Also - sd_daemon7, + systemd1, + sd-daemon7, sd_listen_fds3, - systemd8, systemd.service5, systemd.socket5 diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml index 10ea57c972..4164a991d9 100644 --- a/man/sd_listen_fds.xml +++ b/man/sd_listen_fds.xml @@ -163,13 +163,13 @@ See Also - sd_daemon7, + systemd1, + sd-daemon7, sd_is_fifo3, sd_is_socket3, sd_is_socket_inet3, sd_is_socket_unix3, daemon7, - systemd8, systemd.service5, systemd.socket5 diff --git a/man/sd_notify.xml b/man/sd_notify.xml index 140e795979..9d55ca4f8c 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -267,9 +267,9 @@ See Also + systemd1, sd_daemon7, daemon7, - systemd8, systemd.service5 diff --git a/man/shutdown.xml b/man/shutdown.xml new file mode 100644 index 0000000000..bff68213e6 --- /dev/null +++ b/man/shutdown.xml @@ -0,0 +1,155 @@ + + + + + + + + + shutdown + systemd + + + + Developer + Lennart + Poettering + lennart@poettering.net + + + + + + shutdown + 8 + + + + shutdown + Halt, power-off or reboot the machine + + + + + shutdown OPTIONS now WALL + + + + + Description + + shutdown may be used to halt, + power-off or reboot the machine. + + The first argument should be the string + now which however is ignored by + this implementation. Optionally, this may be followed + by a wall message to be sent to all logged-in users + before going down. + + + + Options + + The following options are understood: + + + + + + Prints a short help + text and exits. + + + + + + + Halt the machine. + + + + + + + Power-off the + machine (the default). + + + + + + + Reboot the + machine. + + + + + + Equivalent to + , unless + is + specified. + + + + + + Don't halt, power-off, + reboot, just write wall + message. + + + + + + Don't send wall + message before + halt, power-off, reboot. + + + + + + Exit status + + On success 0 is returned, a non-zero failure + code otherwise. + + + + Notes + + This is a legacy command available for + compatibility only. + + + + See Also + + systemd1, + systemctl1, + halt8 + + + + diff --git a/man/systemd-install.xml b/man/systemd-install.xml index 7cd23da574..bb52230856 100644 --- a/man/systemd-install.xml +++ b/man/systemd-install.xml @@ -50,13 +50,13 @@ - systemd-install options enable name + systemd-install OPTIONS enable NAME - systemd-install options disable name + systemd-install OPTIONS disable NAME - systemd-install options test name + systemd-install OPTIONS test NAME @@ -116,7 +116,7 @@ - The following verbs are understood: + The following commands are understood: @@ -161,6 +161,7 @@ See Also + systemd1, systemctl1, systemd.unit5 diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 73dde5aa4f..7c2320e665 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -104,19 +104,19 @@ - See Also - - systemd8, - systemctl8 - systemd.special7 - systemd.service5 - systemd.socket5 - systemd.device5 - systemd.mount5 - systemd.automount5 - systemd.swap5 - systemd.target5 - + See Also + + systemd1, + systemctl8 + systemd.special7 + systemd.service5 + systemd.socket5 + systemd.device5 + systemd.mount5 + systemd.automount5 + systemd.swap5 + systemd.target5 + diff --git a/man/systemd.xml b/man/systemd.xml index 8766f04a95..f754348ce1 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -39,7 +39,7 @@ systemd - 8 + 1 @@ -49,10 +49,10 @@ - systemd options + systemd OPTIONS - init options + init OPTIONS COMMAND @@ -81,7 +81,8 @@ - | + + Prints a short help text and exits. @@ -196,6 +197,28 @@ + + Directories + + + + Signal + + + + SIGTERM + + systemd serializes its + state, reexecutes itself and + deserializes the saved state + again. This is mostly equivalent to + systemctl + daemon-reexec. + + + + + Sockets and FIFOs diff --git a/man/telinit.xml b/man/telinit.xml new file mode 100644 index 0000000000..925187941f --- /dev/null +++ b/man/telinit.xml @@ -0,0 +1,194 @@ + + + + + + + + + telinit + systemd + + + + Developer + Lennart + Poettering + lennart@poettering.net + + + + + + telinit + 8 + + + + telinit + Change SysV runlevel + + + + + telinit OPTIONS COMMAND + + + + + Description + + telinit may be used to change + the SysV system runlevel. Since the concept of SysV + runlevels is obsolete the runlevel requests + will be transparently translated into systemd unit + activation requests. + + + + + Options + + The following options are understood: + + + + + + Prints a short help + text and exits. + + + + + + Don't send wall + message before + reboot/halt/power-off. + + + + The following commands are understood: + + + + 0 + + Power-off the + machine. This is translated into an + activation request for + poweroff.target + and is equivalent to + systemctl + poweroff. + + + + 6 + + Reboot the + machine. This is translated into an + activation request for + reboot.target and + is equivalent to systemctl + reboot. + + + + 2 + 3 + 4 + 5 + + Change the SysV + runlevel. This is translated into an + activation request for + runlevel2.target, + runlevel3.target, + ... and is equivalent to + systemctl start + runlevel2.target, + systemctl start + runlevel3.target, + ... + + + + 1 + s + S + + Change into system + rescue mode. This is translated into + an activation request for + rescue.target and + is equivalent to systemctl + rescue. + + + + q + Q + + Reload daemon + configuration. This is equivalent to + systemctl + daemon-reload. + + + + u + U + + Serialize state, + reexecute daemon and deserialize state + again. This is equivalent to + systemctl + daemon-reexec. + + + + + + + Exit status + + On success 0 is returned, a non-zero failure + code otherwise. + + + + Notes + + This is a legacy command available for compatibility + only. It should not be used anymore, as the concept of + runlevels is obsolete. + + + + See Also + + systemd1, + systemctl1 + + + + -- cgit v1.2.3-54-g00ecf From 436c44a5d64ef136ead64e9b03c8c05cc573a61b Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 24 Jun 2010 17:25:16 +0200 Subject: man: spelling fixes --- man/daemon.xml | 6 +++--- man/runlevel.xml | 2 +- man/sd_booted.xml | 2 +- man/sd_listen_fds.xml | 2 +- man/sd_notify.xml | 2 +- man/systemctl.xml | 2 +- man/systemd-install.xml | 2 +- man/systemd.unit.xml | 2 +- man/systemd.xml | 10 +++++----- 9 files changed, 15 insertions(+), 15 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index 650e0fa8b1..1cddf38f74 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -65,7 +65,7 @@ starts, it should execute the following steps as part of the initialization. Note that these steps are unnecessary for new-style daemons, - and should only be implemented if compatbility + and should only be implemented if compatibility with SysV is essential. @@ -213,7 +213,7 @@ As much as possible, rely on systemd's functionality to - limit the accces of the daemon to + limit the access of the daemon to files, services and other resources. i.e. rely on systemd's resource limit control instead of @@ -250,7 +250,7 @@ scheme pointed out below. Like D-Bus activation this enables on-demand starting of services as well as it - allows improved parallization of + allows improved parallelization of service start-up. Also, for state-less protocols (such as syslog, DNS) a daemon implementing socket-based diff --git a/man/runlevel.xml b/man/runlevel.xml index 04959b18a9..879b5e1e3b 100644 --- a/man/runlevel.xml +++ b/man/runlevel.xml @@ -64,7 +64,7 @@ determined N is printed instead. If neither can be determined the word "unknown" is printed. - Unless overriden in the environment this will + Unless overridden in the environment this will check the utmp database for recent runlevel changes. diff --git a/man/sd_booted.xml b/man/sd_booted.xml index 8d5606d79f..4d7473367e 100644 --- a/man/sd_booted.xml +++ b/man/sd_booted.xml @@ -70,7 +70,7 @@ On failure, this call returns a negative errno-style error code. If the system was booted up with systemd as init system this call returns a - postive return value, zero otherwise. + positive return value, zero otherwise. diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml index 54874fd186..734e2374d9 100644 --- a/man/sd_listen_fds.xml +++ b/man/sd_listen_fds.xml @@ -90,7 +90,7 @@ sd_is_socket_inet3, sd_is_socket_unix3 are provided. In order to maximize flexibility it is - recommened to make these checks as loose as possible + recommended to make these checks as loose as possible without allowing incorrect setups. i.e. often the actual port number a socket is bound to matters little for the service to work, hence it should not be diff --git a/man/sd_notify.xml b/man/sd_notify.xml index 6a689555dd..8e6ee61006 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -153,7 +153,7 @@ - It is recommened to prefix variable names that + It is recommended to prefix variable names that are not shown in the list above with X_ to avoid namespace clashes. diff --git a/man/systemctl.xml b/man/systemctl.xml index 696a5060ad..2ffc87df2b 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -102,7 +102,7 @@ If the requested - operation conflicts with an exisiting + operation conflicts with an existing unfinished operation, replace the existing operation by the requested operation. If this is not specified diff --git a/man/systemd-install.xml b/man/systemd-install.xml index 8afa7d9ee8..63832aa6b4 100644 --- a/man/systemd-install.xml +++ b/man/systemd-install.xml @@ -149,7 +149,7 @@ Checks whether any of the units specified are installed. This will check for the - existance of a number of symlinks as + existence of a number of symlinks as encoded in the [Install] section of a unit file. diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index af89d316d5..7e657c64f7 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -64,7 +64,7 @@ A unit configuration file encodes information about a service, a socket, a device, a mount point, an - automount point, a swap file or patition, a start-up + automount point, a swap file or partition, a start-up target, a file system path or a timer controlled and supervised by systemd1. The syntax is inspired by XDG .desktop files, which are in turn diff --git a/man/systemd.xml b/man/systemd.xml index 46082839b0..8f58b665c2 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -137,7 +137,7 @@ Extract D-Bus interface introspection data. This is - mostly useful at build ot install time + mostly useful at build at install time to generate data suitable for the D-Bus interfaces repository. Optionally the interface @@ -459,7 +459,7 @@ $SYSTEMD_LOG_LEVEL systemd reads the log level from this environment - variable. This can be overriden with + variable. This can be overridden with . @@ -467,7 +467,7 @@ $SYSTEMD_LOG_TARGET systemd reads the log target from this environment - variable. This can be overriden with + variable. This can be overridden with . @@ -475,7 +475,7 @@ $SYSTEMD_LOG_COLOR Controls whether systemd highlights important log - messages. This can be overriden with + messages. This can be overridden with . @@ -484,7 +484,7 @@ Controls whether systemd prints the code location along with log messages. This can be - overriden with + overridden with . -- cgit v1.2.3-54-g00ecf From 62adf224d1d3e225de072a2815dd50e973230f5c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 3 Jul 2010 19:54:00 +0200 Subject: man: various man page updates --- man/daemon.xml | 369 +++++++++++++++++++++++++++++++++++++++------ man/systemd.path.xml | 11 ++ man/systemd.service.xml | 69 ++++++--- man/systemd.socket.xml | 15 ++ man/systemd.special.xml.in | 81 ++++++---- man/systemd.target.xml | 14 +- man/systemd.timer.xml | 11 ++ man/systemd.unit.xml | 36 ++++- 8 files changed, 505 insertions(+), 101 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index 1cddf38f74..853b3bb814 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -21,7 +21,7 @@ along with systemd; If not, see . --> - + daemon @@ -55,8 +55,9 @@ functionality to other processes. Traditionally, daemons are implemented following a scheme originating in SysV Unix. Modern daemons should follow a simpler - yet more powerful scheme here called "new-style" - daemons, as implemented by systemd. + yet more powerful scheme (here called "new-style" + daemons), as implemented by + systemd1. SysV Daemons @@ -64,7 +65,7 @@ When a traditional SysV daemon starts, it should execute the following steps as part of the initialization. Note that these - steps are unnecessary for new-style daemons, + steps are unnecessary for new-style daemons (see below), and should only be implemented if compatibility with SysV is essential. @@ -80,7 +81,7 @@ /proc/self/fd, with a fallback of iterating from file descriptor 3 to the value returned by - getrlimit() for + getrlimit() for RLIMIT_NOFILE. Reset all signal @@ -91,23 +92,30 @@ SIG_DFL. Reset the signal mask - using sigprocmask(). + using + sigprocmask(). - Call fork(), + Sanitize the + environment block, removing or + resetting environment variables that + might negatively impact daemon + runtime. + + Call fork(), to create a background process. In the child, call - setsid() to detach from any terminal - and create an independent - session. + setsid() to + detach from any terminal and create an + independent session. In the child, call - fork() again, to ensure the daemon can - never re-aquire a terminal - again. + fork() again, to + ensure the daemon can never re-aquire + a terminal again. - Call exit() in the + Call exit() in the first child, so that only the second child (the actual daemon process) stays around. This ensures that the @@ -122,7 +130,7 @@ In the daemon process, reset the umask to 0, so that the file - modes passed to open(), mkdir() and + modes passed to open(), mkdir() and suchlike directly control the access mode of the created files and directories. @@ -134,6 +142,23 @@ blocks mount points from being unmounted. + In the daemon process, + write the daemon PID (as returned by + getpid()) to a + PID file, for example + /var/run/foobar.pid + (for a hypothetical daemon "foobar"), + to ensure that the daemon cannot be + started more than once. This must be + implemented in race-free fashion so + that the PID file is only updated when + at the same time it is verified that + the PID previously stored in the PID + file no longer exists or belongs to a + foreign process. Commonly some kind of + file locking is employed to implement + this logic. + In the daemon process, drop privileges, if possible and applicable. @@ -144,21 +169,25 @@ complete. This can be implemented via an unnamed pipe or similar communication channel that is created - before the first fork() and available - in both processes. + before the first + fork() and hence + available in both the original and the + daemon process. - Call exit() in the + Call + exit() in the original process. The process that invoked the daemon must be able to - rely that this exit() happens after - initialization is complete and all - external communication channels + rely that this + exit() happens + after initialization is complete and + all external communication channels established and accessible. - The BSD daemon() function should not be - used, as it does only a subset of these steps. + The BSD daemon() function should not be + used, as it implements only a subset of these steps. A daemon that needs to provide compatibility with SysV systems should @@ -190,6 +219,17 @@ execute them when run as new-style service. + Note that new-style init systems + guarantee execution of daemon processes in + clean process contexts: it is guaranteed that + the environment block is sanitized, that the + signal handlers and mask is reset and that no + left-over file descriptors are passed. Daemons + will be executed in their own session, and + STDIN/STDOUT/STDERR connected to + /dev/null unless + otherwise configured. The umask is reset. + It is recommended for new-style daemons to implement the following: @@ -207,9 +247,10 @@ this is used by the init system to detect service errors and problems. It is recommended to follow the exit code - scheme as defined in LSB - recommendations for SysV init scripts - (http://refspecs.freestandards.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html). + scheme as defined in the LSB + recommendations for SysV init + scripts. As much as possible, rely on systemd's functionality to @@ -220,7 +261,10 @@ implementing your own, rely on systemd's privilege dropping code instead of implementing it in the - daemon, and similar. + daemon, and similar. See + systemd.exec5 + for the available + controls. If possible and applicable expose the daemon's control @@ -239,8 +283,8 @@ boot-up speed; your daemon can be restarted on failure, without losing any bus requests, as the bus queues - requests for activatable - services. + requests for activatable services. See + below for details. If your daemon provides services to other local @@ -255,20 +299,21 @@ protocols (such as syslog, DNS) a daemon implementing socket-based activation can be restarted without - losing a single - request. + losing a single request. See below for + details. If applicable a daemon should notify the init system about - startup completion or status - updates via the sd_notify() + startup completion or status updates + via the + sd_notify3 interface. Instead of using the - syslog() call to log directly to the + syslog() call to log directly to the system logger, a new-style daemon may choose to simply log to STDERR via - fprintf(), which is then forwarded to + fprintf(), which is then forwarded to syslog by the init system. If log priorities are necessary these can be encoded by prefixing individual log @@ -276,30 +321,259 @@ (for log priority 4 "WARNING" in the syslog priority scheme), following a similar style as the Linux kernel's - printk() priority system. In fact, using - this style of logging also enables the - init system to optionally direct all - application logging to the kernel log - buffer (kmsg), as accessible via - dmesg. + printk() priority system. In fact, + using this style of logging also + enables the init system to optionally + direct all application logging to the + kernel log buffer (kmsg), as + accessible via + dmesg1. This + kind of logging may be enabled by + setting + StandardError=syslog + in the service unit file. For details + see + sd-daemon7 + and + systemd.exec5. + + These recommendations are similar but + not identical to the Apple + MacOS X Daemon Requirements. - Bus Activation + Socket-Based Activation - Socket Activation + Bus-Based Activation - Writing Service Files + Path-Based Activation + + + + Writing Systemd Unit Files + + When writing systemd unit files, it is + recommended to consider the following + suggestions: + + + If possible do not use + the Type=forking + setting in service files. But if you + do, make sure to set the PID file path + using PIDFile=. See + systemd.service5 + for details. + + If your daemon + registers a D-Bus name on the bus, + make sure to use + Type=dbus if + possible. + + Make sure to set a + good human-readable description string + with + Description=. + + Do not disable + DefaultDependencies=, + unless you really know what you do and + your unit is involved in early boot or + late system shutdown. + + Normally, little if + any dependencies should need to + be defined explicitly. However, if you + do configure explicit dependencies, only refer to + unit names listed on + systemd.special7 + or names introduced by your own + package to keep the unit file + operating + system-independent. + + Make sure to include + an [Install] section including + installation information for the unit + file. See + systemd.unit5 + for details. To activate your service + on boot make sure to add a + WantedBy=multi-user.target + or + WantedBy=graphical.target directive. + + Installing Service Files + + At the build installation time + (e.g. make install during + package build) packages are recommended to + install their systemd unit files in the + directory returned by pkg-config + systemd + --variable=systemdsystemnunitdir + (for system services), + resp. pkg-config systemd + --variable=systemdsessionunitdir + (for session services). This will make the + services available in the system on explicit + request but not activate them automatically + during boot. Optionally, during package + installation (e.g. rpm -i + by the administrator) symlinks should be + created in the systemd configuration + directories via the + systemd-install1 + tool, to activate them automatically on + boot. + + Packages using + autoconf1 + are recommended to use a configure script + excerpt like the following to determine the + unit installation path during source + configuration: + + PKG_PROG_PKG_CONFIG +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"]) + + This snippet allows automatic + installation of the unit files on systemd + 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 + reader.) + + Additionally, to ensure that + make distcheck continues to + work, it is recommended to add the following + to the top-level Makefile.am + file in + automake1-based + projects: + + DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + + Finally, unit files should be installed in the system with an automake excerpt like the following: + + if HAVE_SYSTEMD +systemdsystemunit_DATA = \ + foobar.socket \ + foobar.service +endif + + In the + rpm8 + .spec file use a snippet like + the following to enable/disable the service + during installation/deinstallation. Consult + the packaging guidelines of your distribution + for details and the equivalent for other + packaging managers: + + %post +/usr/bin/systemd-install enable foobar.service foobar.socket >/dev/null 2>&1 || : + +%preun +if [ "$1" -eq 0 ]; then + /usr/bin/systemd-install disable foobar.service foobar.socket >/dev/null 2>&1 || : +fi + + + + + Porting Existing Daemons + + Since new-style init systems such as + systemd are compatible with traditional SysV + init systems it is not strictly necessary to + port existing daemons to the new + style. However doing this offers additional + functionality to the daemons as well as it + simplifies integration into new-style init + systems. + + To port an existing SysV compatible + daemon the following steps are + recommended: + + + If not already + implemented, add an optional command + line switch to the daemon to disable + daemonization. This is useful not only + for using the daemon in new-style init + systems, but also to ease debugging. + + If the daemon offers + interfaces to other software running + on the local system via local AF_UNIX + sockets, consider implementing + socket-based activation (see + above). Usually a minimal patch is + sufficient to implement this: Extend + the socket creation in the daemon code + so that + sd_listen_fds3 + is checked for already passed sockets + first. If sockets are passed + (i.e. when + sd_listen_fds() + returns a positive value), skip the + socket createn step and use the passed + sockets. Secondly, ensure 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 passed. Third, if + the daemon normally closes all + remaining open file descriptors as + part of its initialization, the + sockets passed from the init system + must be spared. Since new-style init + systems guarantee that no left-over + file descriptors are passed to + executed processes, it might be a good + choice to simply skip the closing of + all remaining open file descriptors if + file descriptors are + passed. + + Write and install a + systemd unit file for the service (and + the sockets if socket-based activation + is used, as well as a path unit file, + if the daemon processes a spool + directory), see above for + details. + + If the daemon exposes + interfaces via D-Bus, write and + install a D-Bus activation file for + the service, see above for + details. + + @@ -309,8 +583,11 @@ See Also systemd1, - daemon3, - sd_listen_fds3 + systemd-install1, + sd-daemon7, + sd_listen_fds3, + sd_notify3, + daemon3 diff --git a/man/systemd.path.xml b/man/systemd.path.xml index 772190096d..d910d2c5c8 100644 --- a/man/systemd.path.xml +++ b/man/systemd.path.xml @@ -87,6 +87,17 @@ If an path unit is beneath another mount point in the file system hierarchy, a dependency between both units is created automatically. + + Unless DefaultDependencies= + is set to , path units will + implicitly have dependencies of type + Conflicts= and + Before= on + shutdown.target. These ensure + that path units are terminated cleanly prior to system + shutdown. Only path units involved with early boot or + late system shutdown should disable this + option. diff --git a/man/systemd.service.xml b/man/systemd.service.xml index b01641f1e4..91d6d09409 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -64,27 +64,44 @@ systemd.unit5 for the common options of all unit configuration files. The common configuration items are configured - in the generic [Unit] and [Install] sections. The - service specific configuration options are configured - in the [Service] section. + in the generic [Unit] and + [Install] sections. The service + specific configuration options are configured in the + [Service] section. Additional options are listed in systemd.exec5, which define the execution environment the commands are executed in. + + Unless DefaultDependencies= + is set to , service units will + implicitly have dependencies of type + Requires= and + After= on + basic.target as well as + dependencies of type Conflicts= and + Before= on + shutdown.target. These ensure + that normal service units pull in basic system + initialization, and are terminated cleanly prior to + system shutdown. Only services involved with early + boot or late system shutdown should disable this + option. Options - Service files must include a [Service] section, - which carries information about the service and the - process it supervises. A number of options that may be - used in this section are shared with other unit - types. These options are documented in + Service files must include a + [Service] section, which carries + information about the service and the process it + supervises. A number of options that may be used in + this section are shared with other unit types. These + options are documented in systemd.exec5. The - options specific to the [Service] section of service - units are the following: + options specific to the [Service] + section of service units are the following: @@ -143,14 +160,18 @@ Behaviour of is similar to - , however it - is expected that the daemon acquires a + , however it is + expected that the daemon acquires a name on the D-Bus bus, as configured by BusName=. systemd will proceed starting follow-up units after the D-Bus bus name has been - acquired. + acquired. Service units with this + option configured implicitly have + dependencies on the + dbus.target + unit. Behaviour of is similar to @@ -163,10 +184,13 @@ starting follow-up units after this notification message has been sent. If this option is used - (see + NotifyAccess= (see below) must be set to open access to the notification socket provided by - systemd. + systemd. If + NotifyAccess= is not + set, it will be implicitly set to + . @@ -220,11 +244,12 @@ services. This option may not be specified more than once. Optionally, if the absolute file name is prefixed - with @, the second token will be - passed as argv[0] to the executed - process, followed by the further - arguments specified. Unless - is set, + with @, the second + token will be passed as + argv[0] to the + executed process, followed by the + further arguments specified. Unless + Type=forking is set, the process started via this command line will be considered the main process of the @@ -312,7 +337,7 @@ forcibly via SIGTERM, and after another delay of this time with SIGKILL. (See - + KillMode= below.) Takes a unit-less value in seconds, or a time span value such as "5min 20s". Pass 0 to disable the timeout @@ -450,7 +475,7 @@ Processes will first be terminated via SIGTERM. If then after a delay (configured via the - option) + TimeoutSec= option) processes still remain, the termination request is repeated with the SIGKILL signal. See diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 986ef8c018..6154b304e8 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -95,6 +95,21 @@ which services are instantiated for each incoming connection. + Unless DefaultDependencies= + is set to , socket units will + implicitly have dependencies of type + Requires= and + After= on + sysinit.target as well as + dependencies of type Conflicts= and + Before= on + shutdown.target. These ensure + that socket units pull in basic system + initialization, and are terminated cleanly prior to + system shutdown. Only sockets involved with early + boot or late system shutdown should disable this + option. + Socket units may be used to implement on-demand starting of services, as well as parallelized starting of services. diff --git a/man/systemd.special.xml.in b/man/systemd.special.xml.in index 79c6db1a5b..49dc3892c0 100644 --- a/man/systemd.special.xml.in +++ b/man/systemd.special.xml.in @@ -51,6 +51,7 @@ basic.target, ctrl-alt-del.target, @SPECIAL_DBUS_SERVICE@, + dbus.target, default.target, display-manager.service, emergency.service, @@ -78,8 +79,8 @@ sockets.target, swap.target, sysinit.target, - syslog.target, @SPECIAL_SYSLOG_SERVICE@, + syslog.target, systemd-initctl.service, systemd-initctl.socket, systemd-logger.service, @@ -141,6 +142,28 @@ up systemd will connect to it and register its service. + + Units should generally + avoid depending on this unit + directly and instead refer to + the + dbus.target + unit instead, which pulls this + one in directly or indirectly + via socket-based activation. + + + + dbus.target + + Administrators should + ensure that this target pulls + in a service unit with the + name or alias of + @SPECIAL_DBUS_SERVICE@ + (or a socket unit that + activates this + service). @@ -522,28 +545,6 @@ files. - - syslog.target - - systemd automatically - adds dependencies of type - After for this target unit to - all SysV init script service - units with an LSB header - referring to the - $syslog - facility. - - Administrators should - ensure that this target pulls - in a service unit with the - name or alias of - @SPECIAL_SYSLOG_SERVICE@ - (or a socket unit that - activates this - service). - - sysinit.target @@ -571,11 +572,37 @@ and use it for logging if it has been configured for that. - Applications should - generally not depend on this - service, and depend on + + Units should generally + avoid depending on this unit + directly and instead refer to + the syslog.target - instead. + unit instead, which pulls this + one in directly or indirectly + via socket-based activation. + + + + syslog.target + + systemd automatically + adds dependencies of type + After for this target unit to + all SysV init script service + units with an LSB header + referring to the + $syslog + facility. + + Administrators should + ensure that this target pulls + in a service unit with the + name or alias of + @SPECIAL_SYSLOG_SERVICE@ + (or a socket unit that + activates this + service). diff --git a/man/systemd.target.xml b/man/systemd.target.xml index 88a9e6eada..6f3bc182dc 100644 --- a/man/systemd.target.xml +++ b/man/systemd.target.xml @@ -76,12 +76,22 @@ dependencies between units. Among other things, target units are a more flexible replacement for SysV runlevels in the classic SysV init system. (And for - compatibility reasons there exist special + compatibility reasons special target units such as - runlevel3.target which are used by + runlevel3.target exist which are used by the SysV runlevel compatibility code in systemd. See systemd.special7 for details). + + Unless + DefaultDependencies= is set to + , target units will + implicitly complement all configured dependencies of type + Wants=, + Requires=, + RequiresOverridable= with + dependencies of type After=. + diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml index 7a4cd34887..ef89693f14 100644 --- a/man/systemd.timer.xml +++ b/man/systemd.timer.xml @@ -76,6 +76,17 @@ matching service foo.service. The unit to activate may be controlled by Unit= (see below). + + Unless DefaultDependencies= + is set to , timer units will + implicitly have dependencies of type + Conflicts= and + Before= on + shutdown.target. These ensure + that timer units are stopped cleanly prior to system + shutdown. Only timer units involved with early boot or + late system shutdown should disable this + option. diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 9c4269f3d2..26272c4410 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -215,10 +215,10 @@ Description= A free-form string - describing the unit. This is intended for use - in UIs wanting to show - descriptive information along with the - unit name. + describing the unit. This is intended + for use in UIs to show descriptive + information along with the unit + name. @@ -451,6 +451,34 @@ . + + DefaultDependencies= + + Takes a boolean + argument. If + (the default), a few default + dependencies will implicitly be + created for the unit. The actual + dependencies created depend on the + unit type. For example, for service + units, these dependencies ensure that + the service is started only after + basic system initialization is + complete and is properly terminated on + system shutdown. See the respective + man pages for details. Generally, only + services involved with early boot or + late shutdown should set this option + to . It is + highly recommended to leave this + option enabled for the majority of + common units. If set to + this option + does not disable all implicit + dependencies, just non-essential + ones. + + Unit file may include a [Install] section, which -- cgit v1.2.3-54-g00ecf From 99ffae46d38f05b6c8bc09fe29e50a507ae8b79b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 6 Jul 2010 03:20:49 +0200 Subject: man: add missing parts to man pages --- man/daemon.xml | 478 +++++++++++++++++++++++++++++++++++++++---------- man/systemd.device.xml | 20 ++- man/systemd.xml | 106 +++++++++++ 3 files changed, 503 insertions(+), 101 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index 853b3bb814..01ab0f3b51 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -57,7 +57,10 @@ in SysV Unix. Modern daemons should follow a simpler yet more powerful scheme (here called "new-style" daemons), as implemented by - systemd1. + systemd1. This + manual page covers both schemes, and in + particular includes recommendations for daemons that + shall be included in the systemd init system. SysV Daemons @@ -252,26 +255,35 @@ recommendations for SysV init scripts. - As much as possible, - rely on systemd's functionality to - limit the access of the daemon to - files, services and other - resources. i.e. rely on systemd's - resource limit control instead of - implementing your own, rely on - systemd's privilege dropping code - instead of implementing it in the - daemon, and similar. See - systemd.exec5 - for the available - controls. - If possible and applicable expose the daemon's control interface via the D-Bus IPC system and grab a bus name as last step of initialization. + For integration in + systemd, provide a + .service unit + file that carries information about + starting, stopping and otherwise + maintaining the daemon. See + systemd.service5 + for details. + + As much as possible, + rely on the init systemd's + functionality to limit the access of + the daemon to files, services and + other resources. i.e. in the case of + systemd, rely on systemd's resource + limit control instead of implementing + your own, rely on systemd's privilege + dropping code instead of implementing + it in the daemon, and similar. See + systemd.exec5 + for the available + controls. + If D-Bus is used, make your daemon bus-activatable, via supplying a D-Bus service activation @@ -345,18 +357,308 @@ MacOS X Daemon Requirements. + + + Activation + + New-style init systems provide multiple + additional mechanisms to activate services, as + detailed below. It is common that services are + configured to be activated via more than one mechanism + at the same time. An example for systemd: + bluetoothd.service might get + activated either when Bluetooth hardware is plugged + in, or when an application accesses its programming + interfaces via D-Bus. Or, a print server daemon might + get activated when traffic arrives at an IPP port, or + when a printer is plugged in, or when a file is queued + in the printer spool directory. Even for services that + are intended to be started on system bootup + unconditionally it is a good idea to implement some of + the various activation schemes outlined below, in + order to maximize parallelization: if a daemon + implements a D-Bus service or listening socket, + implementing the full bus and socket activation scheme + allows starting of the daemon with its clients in + parallel (which speeds up boot-up), since all its + communication channels are established already, and no + request is lost because client requests will be queued + by the bus system (in case of D-Bus) or the kernel (in + case of sockets), until the activation + completed. + + + Activation on Boot + + Old-style daemons are usually activated + exclusively on boot (and manually by the + administrator) via SysV init scripts, as + detailed in the LSB + Linux Standard Base Core + Specification. This method of + activation is supported ubiquitiously on Linux + init systems, both old-style and new-style + systems. Among other issues SysV init scripts + have the disadvantage of involving shell + scripts in the boot process. New-style init + systems generally employ updated versions of + activation, both during boot-up and during + runtime and using more minimal service + description files. + + In systemd, if the developer or + administrator wants to make sure a service or + other unit is activated automatically on boot + it is recommended to place a symlink to the + unit file in the .wants/ + directory of either + multi-user.target or + graphical.target, which + are normally used as boot targets at system + startup. See + systemd.unit5 + for details about the + .wants/ directories, and + systemd.special7 + for details about the two boot targets. + + + Socket-Based Activation + + In order to maximize the possible + parallelization and robustness and simplify + configuration and development, it is + recommended for all new-style daemons that + communicate via listening sockets to employ + socket-based activation. In a socket-based + activation scheme the creation and binding of + the listening socket as primary communication + channel of daemons to local (and sometimes + remote) clients is moved out of the daemon + code and into the init system. Based on + per-daemon configuration the init system + installs the sockets and then hands them off + to the spawned process as soon as the + respective daemon is to be started. + Optionally activation of the service can be + delayed until the first inbound traffic + arrives at the socket, to implement on-demand + 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 + are established. In addition to that daemons + can be restarted with losing only a minimal + number of client transactions or even any + client request at all (the latter is + particularly true for state-less protocols, + such as DNS or syslog), because the socket + stays bound and accessible during the restart, + and all requests are queued while the daemon + cannot process them. + + New-style daemons which support socket + activation must be able to receive their + sockets from the init system, instead of 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 + details about porting existing daemons to + socket-based activation see below. With + minimal effort it is possible to implement + socket-based activation in addition to + traditional internal socket creation in the + same codebase in order to support both + new-style and old-style init systems from the + same daemon binary. + + systemd implements socket-based + activation via .socket + units, which are described in + systemd.socket5. When + configuring socket units for socket-based + activation it is essential that all listening + sockets are pulled in by the special target + unit sockets.target. It + is recommended to place a + WantedBy=sockets.target + directive in the [Install] + section, to automatically add such a + dependency on installation of a socket + unit. Unless + DefaultDependencies=no is + set the necessary ordering dependencies are + implicitly created for all socket units. For + more information about + sockets.target see + systemd.special7. It + is not necessary or recommended to place any + additional dependencies on socket units (for + example from + multi-user.target or + suchlike) when one is installed in + sockets.target. Bus-Based Activation + + When the D-Bus IPC system is used for + communication with clients, new-style daemons + should employ bus activation so that they are + automatically activated when a client + application accesses their IPC + interfaces. This is configured in D-Bus + service files (not to be confused with systemd + service unit files!). To ensure that D-Bus + uses systemd to start-up and maintain the + daemon use the + SystemdService= directive + in these service files, to configure the + matching systemd service for a D-Bus + service. e.g.: for a D-Bus service whose D-Bus + activation file is named + org.freedesktop.RealtimeKit.service, + make sure to set + SystemdService=rtkit-daemon.service + in that file, to bind it to the systemd + service + rtkit-daemon.service. This + is needed to make sure that the daemon is + started in a race-free fashion when activated + via multiple mechanisms simultaneously. + + + + Device-Based Activation + + Often, daemons that manage a particular + type of hardware should be activated only when + the hardware of the respective kind is plugged + in or otherwise becomes available. In a + new-style init system it is possible to bind + activation to hardware plug/unplug events. In 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 + kind of unit they may then pull in other units + when activated (i.e. Plugged in) and thus + implement device-based activation. Systemd + dependencies may be encoded in the udev + database via the + SYSTEMD_WANTS= + property. See + systemd.device5 + for details. Often it is nicer to pull in + services from devices only indirectly via + dedicated targets. Example: instead of pulling + in bluetoothd.service + from all the various bluetooth dongles and + other hardware available, pull in + bluetooth.target from them and + bluetoothd.service from + that target. This provides for nicer + abstraction and gives administrators the + option to enable + bluetoothd.service via + controlling a + bluetooth.target.wants/ + symlink uniformly with a tool like + systemd-install1 + instead of manipulating the udev + ruleset. Path-Based Activation + + Often, runtime of daemons processing + spool files or directories (such as a printing + system) can be delayed until these file system + objects change state, or become + non-empty. New-style init systems provide a + way to bind service activation to file system + changes. systemd implements this scheme via + path-based activation configured in + .path units, as outlined + in + systemd.path5. + + + + Timer-Based Activation + + Some daemons that implement clean-up + jobs that are intended to be executed in + regular intervals benefit from timer-based + activation. In systemd, this is implemented + via .timer units, as + described in + systemd.timer5. + + Other Forms of Activation + + Other forms of activation have been + suggested and implemented in some + systems. However, often there are simpler or + better alternatives, or they can be put + together of combinations of the schemes + above. Example: sometimes it appears useful to + start daemons or .socket + units when a specific IP address is configured + on a network interface, because network + sockets shall be bound to the + address. However, an alternative to implement + this is by utilizing the Linux IP_FREEBIND + socket option, as accessible via + FreeBind=yes in systemd + socket files (see + systemd.socket5 + for details). This option, when enabled, + allows sockets to be bound to a non-local, not + configured IP address, and hence allows + bindings to a particular IP address before it + actually becomes available, making such an + explicit dependency to the configured address + redundant. Another often suggested trigger for + service activation is low system + load. However, here too, a more convincing + approach might be to make proper use of + features of the operating system: in + particular, the CPU or IO scheduler of + Linux. Instead of scheduling jobs from + userspace based on monitoring the OS + scheduler, it is advisable to leave the + scheduling of processes to the OS scheduler + itself. systemd provides fine-grained access + 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 + should be configured with + CPUSchedulingPolicy=idle + and/or + IOSchedulingClass=idle. Optionally, + this may be combined with timer-based + activation to schedule background jobs during + runtime and with minimal impact on the system, + and remove it from the boot phase + itself. + + + + + Integration with Systemd + Writing Systemd Unit Files @@ -416,7 +718,7 @@ - Installing Service Files + Installing Systemd Service Files At the build installation time (e.g. make install during @@ -488,7 +790,7 @@ endif during installation/deinstallation. Consult the packaging guidelines of your distribution for details and the equivalent for other - packaging managers: + package managers: %post /usr/bin/systemd-install enable foobar.service foobar.socket >/dev/null 2>&1 || : @@ -499,85 +801,70 @@ if [ "$1" -eq 0 ]; then fi - - - Porting Existing Daemons - - Since new-style init systems such as - systemd are compatible with traditional SysV - init systems it is not strictly necessary to - port existing daemons to the new - style. However doing this offers additional - functionality to the daemons as well as it - simplifies integration into new-style init - systems. - - To port an existing SysV compatible - daemon the following steps are - recommended: - - - If not already - implemented, add an optional command - line switch to the daemon to disable - daemonization. This is useful not only - for using the daemon in new-style init - systems, but also to ease debugging. - - If the daemon offers - interfaces to other software running - on the local system via local AF_UNIX - sockets, consider implementing - socket-based activation (see - above). Usually a minimal patch is - sufficient to implement this: Extend - the socket creation in the daemon code - so that - sd_listen_fds3 - is checked for already passed sockets - first. If sockets are passed - (i.e. when - sd_listen_fds() - returns a positive value), skip the - socket createn step and use the passed - sockets. Secondly, ensure 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 passed. Third, if - the daemon normally closes all - remaining open file descriptors as - part of its initialization, the - sockets passed from the init system - must be spared. Since new-style init - systems guarantee that no left-over - file descriptors are passed to - executed processes, it might be a good - choice to simply skip the closing of - all remaining open file descriptors if - file descriptors are - passed. - - Write and install a - systemd unit file for the service (and - the sockets if socket-based activation - is used, as well as a path unit file, - if the daemon processes a spool - directory), see above for - details. - - If the daemon exposes - interfaces via D-Bus, write and - install a D-Bus activation file for - the service, see above for - details. - - - - + + Porting Existing Daemons + + Since new-style init systems such as systemd are + compatible with traditional SysV init systems it is + not strictly necessary to port existing daemons to the + new style. However doing this offers additional + functionality to the daemons as well as it simplifies + integration into new-style init systems. + + To port an existing SysV compatible daemon the + following steps are recommended: + + + If not already implemented, + add an optional command line switch to the + daemon to disable daemonization. This is + useful not only for using the daemon in + new-style init systems, but also to ease + debugging. + + If the daemon offers + interfaces to other software running on the + local system via local AF_UNIX sockets, + consider implementing socket-based activation + (see above). Usually a minimal patch is + sufficient to implement this: Extend the + socket creation in the daemon code so that + sd_listen_fds3 + is checked for already passed sockets + first. If sockets are passed (i.e. when + 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 + AF_UNIX sockets used in the socket-based + activation are not removed when the daemon + shuts down, if sockets have been + passed. Third, if the daemon normally closes + all remaining open file descriptors as part of + its initialization, the sockets passed from + the init system must be spared. Since + new-style init systems guarantee that no + left-over file descriptors are passed to + executed processes, it might be a good choice + to simply skip the closing of all remaining + open file descriptors if file descriptors are + passed. + + Write and install a systemd + unit file for the service (and the sockets if + socket-based activation is used, as well as a + path unit file, if the daemon processes a + spool directory), see above for + details. + + If the daemon exposes + interfaces via D-Bus, write and install a + D-Bus activation file for the service, see + above for details. + + See Also @@ -587,7 +874,8 @@ fi sd-daemon7, sd_listen_fds3, sd_notify3, - daemon3 + daemon3, + systemd.service5 diff --git a/man/systemd.device.xml b/man/systemd.device.xml index a5395a1d48..c5306430fb 100644 --- a/man/systemd.device.xml +++ b/man/systemd.device.xml @@ -64,9 +64,11 @@ systemd.unit5 for the common options of all unit configuration files. The common configuration items are configured - in the generic [Unit] and [Install] sections. A - separate [Device] section does not exist, since no - device-specific options may be configured. + in the generic [Unit] and + [Install] sections. A separate + [Device] section does not exist, + since no device-specific options may be + configured. systemd will automatically create dynamic device units for all kernel devices that are marked with the @@ -100,9 +102,15 @@ Adds dependencies of type Wants from this unit to all listed units. This - may be used to activate arbitrary units, - when a specific device becomes - available. + may be used to activate arbitrary + units, when a specific device becomes + available. Note that this and the + other tags are not taken into account + unless the device is tagged with the + "systemd" string in + the udev database, because otherwise + the device is not exposed as systemd + unit. diff --git a/man/systemd.xml b/man/systemd.xml index 27756723b1..007705e494 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -196,6 +196,112 @@ + + Concepts + + systemd provides a dependency system between + various entities called "units". Units encapsulate + various objects that are relevant for system boot-up + and maintainance. The majority of units are configured + in unit configuration files, whose syntax and basic + set of options is described in + systemd.unit5, + however some are created automatically from other + configuration or dynamically from system state. Units + may be active (meaning started, bound, plugged in, ... + depending on the unit type), or inactive (meaning + stopped, unbound, unplugged, ...), as well is in the + process of being activated or deactivated, + i.e. between the two states. The following unit types + are available: + + + Service units, which control + daemons and the processes they consist of. For + details see + systemd.service5. + + Socket units, which + encapsulate local IPC or network sockets in + the system, useful for socket-based + activation. For details about socket units see + systemd.socket5, + for details on socket-based activation and + other forms of activation, see + daemon7. + + Target units are useful to + group units, or provide well-known + synchronization points during boot-up, see + systemd.target5. + + Device units expose kernel + devices in systemd and may be used to + implement device-based activation. For details + see + systemd.device5. + + Mount units control mount + points in the file system, for details see + systemd.mount5. + + Automount units provide + automount capabilities, for on-demand mounting + of file systems as well as parallelized + boot-up. See + systemd.automount5. + + Snapshot units can be used to + temporarily save the state of the set of + systemd units, which later may be restored by + activating the saved snapshot unit. For more + information see + systemd.automount5. + + Timer units are useful for + triggering activation of other units based on + timers. You may find details in + systemd.timer5. + + Swap units are very similar to + mount units and encapsulated memory swap + partitions or files of the operating + systemd. They are described in systemd.swap5. + + Path units may be used + activate other services when file system + objects change or are modified. See + systemd.path5. + + + + Units are named as their configuration + files. Some units have special semantics. A detailed + list you may find in + systemd.special7. + + On boot systemd activates the target unit + default.target whose job it is to + activate on-boot services and other on-boot units by + pulling them in via dependencies. Usually the unit + name is just an alias (symlink) for either + graphical.target (for + fully-featured boots into the UI) or + multi-user.target (for limited + console-only boots for use in embedded or server + environments, or similar; a subset of + graphical.target). However it is at the discretion of + the administrator to configure it as an alias to any + other target unit. See + systemd.special7 + for details about these target units. + + For more information about the concepts and + ideas behind systemd please refer to the Original + Announcement Document. + + Directories -- cgit v1.2.3-54-g00ecf From 72f957066d9ccc43699c813d0498fc7f6732a838 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 6 Jul 2010 05:25:24 +0200 Subject: man: document new systemd-install --start option --- man/daemon.xml | 4 +-- man/systemd-install.xml | 70 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 64 insertions(+), 10 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index 01ab0f3b51..8e9e939532 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -793,11 +793,11 @@ endif package managers: %post -/usr/bin/systemd-install enable foobar.service foobar.socket >/dev/null 2>&1 || : +/usr/bin/systemd-install --start enable foobar.service foobar.socket >/dev/null 2>&1 || : %preun if [ "$1" -eq 0 ]; then - /usr/bin/systemd-install disable foobar.service foobar.socket >/dev/null 2>&1 || : + /usr/bin/systemd-install --start disable foobar.service foobar.socket >/dev/null 2>&1 || : fi diff --git a/man/systemd-install.xml b/man/systemd-install.xml index 63832aa6b4..c3ec4bdcd8 100644 --- a/man/systemd-install.xml +++ b/man/systemd-install.xml @@ -68,10 +68,18 @@ enabled. This command is useful to apply or undo the - installation instructions encoded in the [Install] + installation instructions encoded in the [Install] section of unit files. See systemd.unit5 for more information. + + Enabling units (as with systemd-install + enable) should not be confused with + activating units (as with systemctl + start). The former simply installs the unit + files in the configuration tree, but does not start + them. The latter equals starting them, but does not + necessarily require them to be enabled. @@ -120,6 +128,49 @@ session service for all users. + + + + + After + enabling/disabling stop/restart the + unit and reload manager + configuration. Optionally, takes one + of , + , + or + . If + is passed the + manager will not reload its + configuration and no service will be + started or stopped after + enabling/disabling of the unit + files. If is + passed and a unit is being enabled it + will also be restarted should it + already be running. If a unit is being + disabled it will be stopped should it + be running. In either case the + daemon configuration is + reloaded. is + similar to this, but the unit will + also be started if it is being enabled + and any of the units listed in + WantedBy= in the + [Install] section + of the unit file is already + activated. Finally + starts the unit + unconditionally after enabling. This + setting defaults to + . If the mode value + is omitted defaults to + . This option + has no effect when + or + test is + used. + The following commands are understood: @@ -130,17 +181,19 @@ Enable a unit. This will create a number of symlinks as - encoded in the [Install] section of a - unit file. + encoded in the + [Install] section + of a unit file. disable Disable a unit. This - will removed a number of symlinks as - encoded in the [Install] section of a - unit file. + will remove a number of symlinks as + encoded in the + [Install] section + of a unit file. @@ -150,8 +203,9 @@ the units specified are installed. This will check for the existence of a number of symlinks as - encoded in the [Install] section of a - unit file. + encoded in the + [Install] section + of a unit file. -- cgit v1.2.3-54-g00ecf From ad678a066b4ba5d8914dd7d5a4093572841205cf Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Tue, 6 Jul 2010 18:24:38 -0700 Subject: man: minor edits to daemon, sd_listen_fds, sd_notify, systemctl, systemd.exec, systemd, and systemd.timer pages Just some minor grammar fixes. --- man/daemon.xml | 10 +++++----- man/sd_listen_fds.xml | 4 ++-- man/sd_notify.xml | 2 +- man/systemctl.xml | 2 +- man/systemd.exec.xml | 6 +++--- man/systemd.timer.xml | 4 ++-- man/systemd.xml | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index 8e9e939532..dfee390164 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -384,7 +384,7 @@ communication channels are established already, and no request is lost because client requests will be queued by the bus system (in case of D-Bus) or the kernel (in - case of sockets), until the activation + case of sockets), until the activation is completed. @@ -726,7 +726,7 @@ install their systemd unit files in the directory returned by pkg-config systemd - --variable=systemdsystemnunitdir + --variable=systemdsystemunitdir (for system services), resp. pkg-config systemd --variable=systemdsessionunitdir @@ -809,8 +809,8 @@ fi Since new-style init systems such as systemd are compatible with traditional SysV init systems it is not strictly necessary to port existing daemons to the - new style. However doing this offers additional - functionality to the daemons as well as it simplifies + new style. However doing so offers additional + functionality to the daemons as well as simplifying integration into new-style init systems. To port an existing SysV compatible daemon the @@ -849,7 +849,7 @@ fi left-over file descriptors are passed to executed processes, it might be a good choice to simply skip the closing of all remaining - open file descriptors if file descriptors are + open file descriptors if sockets are passed. Write and install a systemd diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml index 06403ecaa3..6fb8d27f24 100644 --- a/man/sd_listen_fds.xml +++ b/man/sd_listen_fds.xml @@ -109,8 +109,8 @@ On failure, this call returns a negative errno-style error code. If $LISTEN_FDS/$LISTEN_PID - was not set or not correctly set for this daemon and - hence no file descriptors received, 0 is + was not set or was not correctly set for this daemon and + hence no file descriptors were received, 0 is returned. Otherwise the number of file descriptors passed is returned. The application may find them starting with file descriptor SD_LISTEN_FDS_START, diff --git a/man/sd_notify.xml b/man/sd_notify.xml index 80856a22d5..7c1d982d85 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -252,7 +252,7 @@ Start-up Notification When a daemon finished starting up, it - might issue the following call call to notify + might issue the following call to notify the init system: sd_notify(0, "READY=1"); diff --git a/man/systemctl.xml b/man/systemctl.xml index c0b8d7927d..a7065f98ae 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -381,7 +381,7 @@ unit files and recreate the entire dependency tree. While the daemon is reloaded, all sockets systemd listens - on on behalf of user configuration, will + on on behalf of user configuration will stay accessible. This command should not be confused with the load or diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 68495dcaf7..a47a62daec 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -374,13 +374,13 @@ . - StandardOutput= + StandardError= Controls where file descriptor 2 (STDERR) of the executed processes is connected to. The available options are identical to those of - StandardError=, + StandardOutput=, whith one exception: if set to the file descriptor used for standard output is @@ -617,7 +617,7 @@ Controls the control groups the executed processes shall be - made member of. Takes a + made members of. Takes a space-seperated list of cgroup identifiers. A cgroup identifier has a format like diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml index 518ae2a9f1..9b6b486bf4 100644 --- a/man/systemd.timer.xml +++ b/man/systemd.timer.xml @@ -170,10 +170,10 @@ specified, this value defaults to a service that has the same name as the timer unit, except for the - suffix. (See above.) It is recommended, + suffix. (See above.) It is recommended that the unit name that is activated and the unit name of the timer unit - are named identical, except for the + are named identically, except for the suffix. diff --git a/man/systemd.xml b/man/systemd.xml index ba775c5c91..4f4a588a98 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -117,7 +117,7 @@ Extract D-Bus interface introspection data. This is - mostly useful at build at install time + mostly useful at install time to generate data suitable for the D-Bus interfaces repository. Optionally the interface -- cgit v1.2.3-54-g00ecf From b4f10a5e8956d26f0bc6b9aef12846b57caee08b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 8 Jul 2010 21:34:51 +0200 Subject: install: various improvements Rename --start to --realize, to make things less confusing when doing "systemctl stop --realize foo.service". Introduce --realize=reload. Don't talk to systemd when run within a chroot, or when systemd isn't running. --- Makefile.am | 3 ++- man/daemon.xml | 4 +-- man/systemd-install.xml | 32 +++++++++++++--------- src/install.c | 72 +++++++++++++++++++++++++++++-------------------- src/socket.c | 2 +- src/util.c | 19 +++++++++++++ src/util.h | 2 ++ 7 files changed, 89 insertions(+), 45 deletions(-) (limited to 'man/daemon.xml') diff --git a/Makefile.am b/Makefile.am index debe475967..52339718a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -503,7 +503,8 @@ systemd_notify_LDADD = \ systemd_install_SOURCES = \ src/install.c \ src/path-lookup.c \ - src/dbus-common.c + src/dbus-common.c \ + src/sd-daemon.c systemd_install_LDADD = \ libsystemd-basic.la \ diff --git a/man/daemon.xml b/man/daemon.xml index dfee390164..b708bdcfba 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -793,11 +793,11 @@ endif package managers: %post -/usr/bin/systemd-install --start enable foobar.service foobar.socket >/dev/null 2>&1 || : +/usr/bin/systemd-install --realize enable foobar.service foobar.socket >/dev/null 2>&1 || : %preun if [ "$1" -eq 0 ]; then - /usr/bin/systemd-install --start disable foobar.service foobar.socket >/dev/null 2>&1 || : + /usr/bin/systemd-install --realize disable foobar.service foobar.socket >/dev/null 2>&1 || : fi diff --git a/man/systemd-install.xml b/man/systemd-install.xml index c3ec4bdcd8..28415d19e1 100644 --- a/man/systemd-install.xml +++ b/man/systemd-install.xml @@ -130,13 +130,14 @@ - + After - enabling/disabling stop/restart the - unit and reload manager + enabling/disabling stop/restart/stop + the unit and reload manager configuration. Optionally, takes one of , + , , or . If @@ -145,13 +146,17 @@ configuration and no service will be started or stopped after enabling/disabling of the unit - files. If is - passed and a unit is being enabled it - will also be restarted should it - already be running. If a unit is being - disabled it will be stopped should it - be running. In either case the - daemon configuration is + files. If is + passed the daemon configuration is + reloaded but the unit otherwise not + started/stopped/restarted. If + is passed and + a unit is being enabled it will also + be restarted should it already be + running. If a unit is being disabled + it will be stopped should it be + running. In either case the daemon + configuration is reloaded. is similar to this, but the unit will also be started if it is being enabled @@ -168,8 +173,11 @@ . This option has no effect when or - test is - used. + test is used, or + when systemd is not running or the + command is executed in a + chroot2 + environment. diff --git a/src/install.c b/src/install.c index 3b70bd1d3d..a05002d073 100644 --- a/src/install.c +++ b/src/install.c @@ -32,6 +32,7 @@ #include "strv.h" #include "conf-parser.h" #include "dbus-common.h" +#include "sd-daemon.h" static bool arg_force = false; @@ -49,11 +50,12 @@ static enum { } arg_action = ACTION_INVALID; static enum { - START_NO, /* Don't start/stop or anything */ - START_MINIMAL, /* Only shutdown/restart if running. */ - START_MAYBE, /* Start if WantedBy= suggests */ - START_YES /* Start unconditionally */ -} arg_start = START_NO; + REALIZE_NO, /* Don't reload/start/stop or anything */ + REALIZE_RELOAD, /* Only reload daemon config, don't stop/start */ + REALIZE_MINIMAL, /* Only shutdown/restart if running. */ + REALIZE_MAYBE, /* Start if WantedBy= suggests */ + REALIZE_YES /* Start unconditionally */ +} arg_realize = REALIZE_NO; typedef struct { char *name; @@ -69,13 +71,13 @@ static int help(void) { printf("%s [OPTIONS...] {COMMAND} ...\n\n" "Install init system units.\n\n" - " -h --help Show this help\n" - " --force Override existing links\n" - " --system Install into system\n" - " --session Install into session\n" - " --global Install into all sessions\n" - " --start[=MODE] Start/stop/restart unit after installation\n" - " Takes 'no', 'minimal', 'maybe' or 'yes'\n\n" + " -h --help Show this help\n" + " --force Override existing links\n" + " --system Install into system\n" + " --session Install into session\n" + " --global Install into all sessions\n" + " --realize[=MODE] Start/stop/restart unit after installation\n" + " Takes 'no', 'minimal', 'maybe' or 'yes'\n\n" "Commands:\n" " enable [NAME...] Enable one or more units\n" " disable [NAME...] Disable one or more units\n" @@ -92,7 +94,7 @@ static int parse_argv(int argc, char *argv[]) { ARG_SYSTEM, ARG_GLOBAL, ARG_FORCE, - ARG_START + ARG_REALIZE }; static const struct option options[] = { @@ -101,7 +103,7 @@ static int parse_argv(int argc, char *argv[]) { { "system", no_argument, NULL, ARG_SYSTEM }, { "global", no_argument, NULL, ARG_GLOBAL }, { "force", no_argument, NULL, ARG_FORCE }, - { "start", optional_argument, NULL, ARG_START }, + { "realize", optional_argument, NULL, ARG_REALIZE }, { NULL, 0, NULL, 0 } }; @@ -134,20 +136,20 @@ static int parse_argv(int argc, char *argv[]) { arg_force = true; break; - case ARG_START: + case ARG_REALIZE: if (!optarg) - arg_start = START_MAYBE; + arg_realize = REALIZE_MAYBE; else if (streq(optarg, "no")) - arg_start = START_NO; + arg_realize = REALIZE_NO; else if (streq(optarg, "minimal")) - arg_start = START_MINIMAL; + arg_realize = REALIZE_MINIMAL; else if (streq(optarg, "maybe")) - arg_start = START_MAYBE; + arg_realize = REALIZE_MAYBE; else if (streq(optarg, "yes")) - arg_start = START_YES; + arg_realize = REALIZE_YES; else { - log_error("Invalid --start argument %s", optarg); + log_error("Invalid --realize argument %s", optarg); return -EINVAL; } @@ -306,7 +308,7 @@ static int install_info_run(DBusConnection *bus, InstallInfo *i) { if (arg_action == ACTION_ENABLE) { - if (arg_start == START_MAYBE) { + if (arg_realize == REALIZE_MAYBE) { char **k; bool yes_please = false; @@ -416,7 +418,7 @@ static int install_info_run(DBusConnection *bus, InstallInfo *i) { "org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", - arg_start == START_MINIMAL ? "TryRestartUnit" : "RestartUnit"))) { + arg_realize == REALIZE_MINIMAL ? "TryRestartUnit" : "RestartUnit"))) { log_error("Could not allocate message."); r = -ENOMEM; goto finish; @@ -778,16 +780,26 @@ static int do_run(void) { dbus_error_init(&error); - if (arg_start == START_NO) + if (arg_realize == REALIZE_NO) return 0; if (arg_where == WHERE_GLOBAL) { - log_warning("Warning: --start has no effect with --global."); + log_warning("Warning: --realize has no effect with --global."); return 0; } if (arg_action != ACTION_ENABLE && arg_action != ACTION_DISABLE) { - log_warning("Warning: --start has no effect with test."); + log_warning("Warning: --realize has no effect with test."); + return 0; + } + + if (arg_where == WHERE_SYSTEM && sd_booted() <= 0) { + log_info("systemd is not running, --realize has not effect."); + return 0; + } + + if (arg_where == WHERE_SYSTEM && running_in_chroot() > 0) { + log_info("Running in a chroot() environment, --realize has no effect."); return 0; } @@ -802,9 +814,11 @@ static int do_run(void) { if ((r = daemon_reload(bus)) < 0) goto finish; - HASHMAP_FOREACH(j, have_installed, i) - if ((q = install_info_run(bus, j)) < 0) - r = q; + if (arg_realize != REALIZE_RELOAD) { + HASHMAP_FOREACH(j, have_installed, i) + if ((q = install_info_run(bus, j)) < 0) + r = q; + } if (arg_action == ACTION_DISABLE) if ((q = daemon_reload(bus)) < 0) diff --git a/src/socket.c b/src/socket.c index ee75de04d6..acd49a5045 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1039,7 +1039,7 @@ static void socket_enter_running(Socket *s, int cfd) { socket_set_state(s, SOCKET_RUNNING); } else { Unit *u; - char *prefix, *instance, *name; + char *prefix, *instance = NULL, *name; if (s->n_connections >= s->max_connections) { log_warning("Too many incoming connections (%u)", s->n_connections); diff --git a/src/util.c b/src/util.c index 2e5827f32d..7f5fa05dca 100644 --- a/src/util.c +++ b/src/util.c @@ -2825,6 +2825,25 @@ int columns(void) { return parsed_columns; } +int running_in_chroot(void) { + struct stat a, b; + + zero(a); + zero(b); + + /* Only works as root */ + + if (stat("/proc/1/root", &a) < 0) + return -errno; + + if (stat("/", &b) < 0) + return -errno; + + return + a.st_dev != b.st_dev || + a.st_ino != b.st_ino; +} + static const char *const ioprio_class_table[] = { [IOPRIO_CLASS_NONE] = "none", [IOPRIO_CLASS_RT] = "realtime", diff --git a/src/util.h b/src/util.h index 5d51c07e2f..1a4c440ba5 100644 --- a/src/util.h +++ b/src/util.h @@ -330,6 +330,8 @@ void status_welcome(void); int columns(void); +int running_in_chroot(void); + const char *ioprio_class_to_string(int i); int ioprio_class_from_string(const char *s); -- cgit v1.2.3-54-g00ecf From 828f33e89bc2fa7ee9bc9f977c04d0e30336d848 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 10 Jul 2010 00:49:00 +0200 Subject: man: update daemon man page a little --- fixme | 6 ++---- man/daemon.xml | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 46 insertions(+), 9 deletions(-) (limited to 'man/daemon.xml') diff --git a/fixme b/fixme index d05d0a3a6e..37c6288d78 100644 --- a/fixme +++ b/fixme @@ -35,16 +35,14 @@ * selinux -* .socket should refuse start when .service is already up to avoid overwriting the socket - * introduce umount.target * pull in umount.target and shutdown.target from emergency.service (?) -* extend recommendations to depend on syslog.target via "After" - * Don't show Accepted/Connected for non-Accept sockets +* Show exit status auf auxiliary programs in systemctl status + External: * patch /etc/init.d/functions with: diff --git a/man/daemon.xml b/man/daemon.xml index b708bdcfba..fb22e6c616 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -678,7 +678,8 @@ If your daemon registers a D-Bus name on the bus, make sure to use - Type=dbus if + Type=dbus in the + service file if possible. Make sure to set a @@ -703,16 +704,45 @@ 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 information for the unit - file. See + an [Install] + section including installation + information for the unit file. See systemd.unit5 for details. To activate your service on boot make sure to add a WantedBy=multi-user.target or - WantedBy=graphical.target directive. + WantedBy=graphical.target + directive. To activate your socket on + boot, make sure to add + WantedBy=sockets.target. Usually + you also want to make sure that when + your service is installed your socket + is installed too, hence add + Also=foo.socket in + your service file + foo.service, for + a hypothetical program + foo. @@ -800,6 +830,15 @@ if [ "$1" -eq 0 ]; then /usr/bin/systemd-install --realize disable foobar.service foobar.socket >/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 argument to + may be + specified. See + systemd-install1 + for details. + -- cgit v1.2.3-54-g00ecf From ee5762e3780c048b230e8c1e7659e40fc1f443bf Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 24 Jul 2010 00:53:33 +0200 Subject: systemctl: fold systemd-install into systemctl --- Makefile.am | 18 +- man/daemon.xml | 49 +- man/systemctl.xml | 330 +++++++++++--- man/systemd-install.xml | 303 ------------ man/systemd.unit.xml | 17 +- man/systemd.xml | 21 +- src/install.c | 1165 ----------------------------------------------- src/systemctl.c | 905 ++++++++++++++++++++++++++++++++---- 8 files changed, 1135 insertions(+), 1673 deletions(-) delete mode 100644 man/systemd-install.xml delete mode 100644 src/install.c (limited to 'man/daemon.xml') diff --git a/Makefile.am b/Makefile.am index 0c3262e02e..bebfd2f737 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,7 +58,6 @@ rootbin_PROGRAMS = \ systemd-notify bin_PROGRAMS = \ - systemd-install \ systemd-cgls if HAVE_GTK @@ -325,7 +324,6 @@ MANPAGES = \ man/systemd.1 \ man/systemctl.1 \ man/systemadm.1 \ - man/systemd-install.1 \ man/systemd-cgls.1 \ man/systemd-notify.1 \ man/sd_notify.3 \ @@ -494,6 +492,8 @@ systemctl_SOURCES = \ src/systemctl.c \ src/utmp-wtmp.c \ src/dbus-common.c \ + src/path-lookup.c \ + src/sd-daemon.c \ src/cgroup-show.c \ src/cgroup-util.c @@ -512,20 +512,6 @@ systemd_notify_SOURCES = \ systemd_notify_LDADD = \ libsystemd-basic.la -systemd_install_SOURCES = \ - src/install.c \ - src/path-lookup.c \ - src/dbus-common.c \ - src/sd-daemon.c - -systemd_install_LDADD = \ - libsystemd-basic.la \ - $(DBUS_LIBS) - -systemd_install_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - systemd_cgls_SOURCES = \ src/cgls.c \ src/cgroup-show.c \ diff --git a/man/daemon.xml b/man/daemon.xml index fb22e6c616..30d39d7be1 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -543,10 +543,10 @@ the hardware of the respective kind is plugged in or otherwise becomes available. In a new-style init system it is possible to bind - activation to hardware plug/unplug events. In systemd, - kernel devices appearing in the sysfs/udev - device tree can be exposed as units if they - are tagged with the string + activation to hardware plug/unplug events. In + 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 kind of unit they may then pull in other units when activated (i.e. Plugged in) and thus @@ -570,8 +570,9 @@ bluetoothd.service via controlling a bluetooth.target.wants/ - symlink uniformly with a tool like - systemd-install1 + symlink uniformly with a command like + enable of + systemctl1 instead of manipulating the udev ruleset. @@ -756,9 +757,9 @@ install their systemd unit files in the directory returned by pkg-config systemd - --variable=systemdsystemunitdir - (for system services), - resp. pkg-config systemd + --variable=systemdsystemunitdir (for + system services), resp. pkg-config + systemd --variable=systemdsessionunitdir (for session services). This will make the services available in the system on explicit @@ -767,8 +768,9 @@ installation (e.g. rpm -i by the administrator) symlinks should be created in the systemd configuration - directories via the - systemd-install1 + directories via the enable + command of the + systemctl1 tool, to activate them automatically on boot. @@ -823,20 +825,32 @@ endif package managers: %post -/usr/bin/systemd-install --realize enable foobar.service foobar.socket >/dev/null 2>&1 || : +if [ $1 -eq 1 ]; then + # Enable (but don't start) the units by default + /bin/systemctl enable foobar.service foobar.socket >/dev/null 2>&1 || : +fi %preun -if [ "$1" -eq 0 ]; then - /usr/bin/systemd-install --realize disable foobar.service foobar.socket >/dev/null 2>&1 || : +if [ $1 -eq 0 ]; then + # Disable and stop the units + /bin/systemctl disable foobar.service foobar.socket >/dev/null 2>&1 || : + /bin/systemctl stop foobar.service foobar.socket >/dev/null 2>&1 || : +fi + +%postun +if [ $1 -ge 1 ] ; then + # On upgrade, reload init system configuration if we changed unit files + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + # On upgrade, 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 argument to - may be + upgrade, a different set of commands may be specified. See - systemd-install1 + systemctl1 for details. @@ -909,7 +923,6 @@ fi See Also systemd1, - systemd-install1, sd-daemon7, sd_listen_fds3, sd_notify3, diff --git a/man/systemctl.xml b/man/systemctl.xml index 678bf0b2ee..6e4b203d88 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -21,7 +21,7 @@ along with systemd; If not, see . --> - + systemctl @@ -96,8 +96,9 @@ When showing unit/job/manager information, limit - display to certain property names. If - not specified all set properties are + display to certain properties as + specified as argument. If not + specified all set properties are shown. The argument should be a property name, such as MainPID. If @@ -131,12 +132,48 @@ If the requested - operation conflicts with an existing - unfinished operation, fail the - command. If this is not specified the - requested operation will replace the - pending job if - necessary. + operation conflicts with a pending + unfinished job, fail the command. If + this is not specified the requested + operation will replace the pending job, + if necessary. + + + + + + + Suppress output to + STDOUT in + snapshot, + check, + enable and + disable. + + + + + + Do not synchronously wait for + the requested operation to finish. If this is + not specified the job will be verified, + enqueued and systemctl will + wait until it is completed. By passing this + argument it is only verified and + enqueued. + + + + + Talk to the systemd + system manager. (Default) + + + + + + Talk to the systemd + session manager of the calling user. @@ -166,46 +203,55 @@ - + - Talk to the systemd - system manager. (Default) + Don't send wall + message before + halt, power-off, reboot. - + - Talk to the systemd - session manager of the calling user. + When used with + enable and + disable, operate on the + global session configuŕation + directory, thus enabling or disabling + a unit file globally for all future + sessions of all users. - + - Do not synchronously wait for - the requested operation to finish. If this is - not specified the job will be verified, - enqueued and systemctl will - wait until it is completed. By passing this - argument it is only verified and - enqueued. + When used with + enable and + disable, do not + implicitly reload daemon configuration + after executing the + changes. + - - + - Suppress output to - STDOUT for snapshot - and - check. + When used with + enable, override any + existing conflicting + symlinks. - + - Don't send wall - message before - halt, power-off, reboot. + When used with + disable, ensures + that only the symlinks created by + enable are removed, + not all symlinks pointing to the unit + file that shall be + disabled. @@ -220,29 +266,28 @@ start [NAME...] - Start one or more - units specified on the command + Start (activate) one + or more units specified on the command line. stop [NAME...] - Stop one or more units - specified on the command + Stop (deactivate) one + or more units specified on the command line. reload [NAME...] - Asks all services - whose units are listed on the command - line to reload their + Asks all units listed + on the command line to reload their configuration. Note that this will - reload the daemon configuration - itself, not the unit configuration - file of systemd. If you want systemd - to reload the configuration file of a - unit use the + reload the service-specific + configuration, not the unit + configuration file of systemd. If you + want systemd to reload the + configuration file of a unit use the daemon-reload command. In other words: for the example case of Apache, this will @@ -250,10 +295,12 @@ httpd.conf in the web server, not the apache.service - systemd unit file. This - command should not be confused with - the daemon-reload - or load + systemd unit file. + + This command should not be + confused with the + daemon-reload or + load commands. @@ -280,9 +327,14 @@ reload-or-try-restart [NAME...] Reload one or more - units if they support it. If not - restart them - instead. + units if they support it. If not, + restart them instead. Note that for + compatibility with SysV and Red Hat + init scripts + force-reload and + condrestart may be + used as equivalent commands to + reload-or-try-restart. isolate [NAME] @@ -293,12 +345,12 @@ others. - check [NAME...] + is-active [NAME...] Check whether any of the specified units is active - (i.e. running). Returns 0 if at least - one is active, non-zero + (i.e. running). Returns an exit code + 0 if at least one is active, non-zero otherwise. Unless is specified this will also print the current unit @@ -307,24 +359,36 @@ status [NAME...] - Show short status - information about one or more - units. This shows terse runtime - information about - units. + Show terse runtime + status information about one or more + units. This function is intended to + generate human-readable output. If you + are looking for computer-parsable + output, use show + instead. show [NAME...|JOB...] - Show properties of - one or more units, jobs or the manager + Show properties of one + or more units, jobs or the manager itself. If no argument is specified properties of the manager will be shown. If a unit name is specified - properties of the unit is shown, - and if a job id is specified - properties of the job is - shown. + properties of the unit is shown, and + if a job id is specified properties of + the job is shown. By default, empty + properties are suppressed. Use + to show those + too. To select specific properties to + show use + . This + command is intended to be used + whenever computer-parsable output is + required. Use + status if you are + looking for formatted human-readable + output. @@ -345,6 +409,133 @@ command. + + enable [NAME...] + + Enable one or more + unit files, as specified on the + command line. This will create a + number of symlinks as encoded in the + [Install] sections + of the unit files. After the symlinks + have been created the systemd + configuration is reloaded (in a way + that is equivalent to + daemon-reload) to + ensure the changes are taken into + account immediately. Note that this + does not have the effect that any of + the units enabled are also started at + the same time. If this is desired a + seperate start + command must be invoked for the + unit. + + This command will + print the actions executed. This + output may be suppressed by passing + . + + Note that this operation creates + only the suggested symlinks for the + units. While this command is the + recommended way to manipulate the unit + configuration directory, the + administrator is free to make + additional changes manually, by + placing or removing symlinks in the + directory. This is particular useful + to create configurations that deviate + from the suggested default + installation. In this case the + administrator must make sure to invoke + daemon-reload + manually as necessary, to ensure his + changes are taken into account. + + Enabling units should not be + confused with starting (activating) + units, as done by the + start + command. Enabling and starting units + is orthogonal: units may be enabled + without being started and started + without being enabled. Enabling simply + hooks the unit into various suggested + places (for example, so that the unit + is automatically started on boot or + when a particular kind of hardware is + plugged in). Starting actually spawns + the daemon process (in case of service + units), or binds the socket (in case + of socket units), and so + on. + + Depending on whether + , + or + is specified + this enables the unit for the system, + for sessions of the calling user only + or for all future session of all + users. Note that in the latter case no + systemd daemon configuration is + reloaded. + + + + + disable [NAME...] + + Disables one or more + units. This removes all symlinks to + the specified unit files from the unit + configuration directory, and hence + undoes the changes made by + enable. Note + however that this by default removes + all symlinks to the unit files + (i.e. including manual additions), not + just those actually created by + enable. If only the + symlinks that are suggested by default + shall be removed, pass + . This + implicitly reloads the systemd daemon + configuration after completing the + disabling of the units. Note that this + command does not implicitly stop the + units that is being disabled. If this + is desired an additional + stopcommand should + be executed afterwards. + + This command will print the + actions executed. This output may be + suppressed by passing + . + + + This command honours + , + , + in a similar + way as + enable. + + + + is-enabled [NAME...] + + Checks whether any of + the specified unit files is enabled + (as with + enable). Returns an + exit code of 0 if at least one is + enabled, non-zero + otherwise. + + load [NAME...] @@ -384,12 +575,7 @@ Cancel one or more jobs specified on the command line by their numeric job - IDs. - - - clear-jobs - - Cancel all jobs that are in progress. + IDs. If not job id is specified cancels all jobs that are pending. monitor diff --git a/man/systemd-install.xml b/man/systemd-install.xml deleted file mode 100644 index 228a916999..0000000000 --- a/man/systemd-install.xml +++ /dev/null @@ -1,303 +0,0 @@ - - - - - - - - - systemd-install - systemd - - - - Developer - Lennart - Poettering - lennart@poettering.net - - - - - - systemd-install - 1 - - - - systemd-install - Enable or disable a systemd unit - definition file - - - - - systemd-install OPTIONS enable NAME - - - systemd-install OPTIONS disable NAME - - - systemd-install OPTIONS realize NAME - - - systemd-install OPTIONS test NAME - - - - - Description - - systemd-install enables or - disables systemd units, or checks whether they are - enabled, according to the installation suggestions - included in the unit files. - - This command is useful to apply or undo the - installation instructions encoded in the [Install] - section of unit files. See - systemd.unit5 - for more information. - - Enabling units (as with systemd-install - enable) should not be confused with - activating units (as with systemctl - start). The former simply installs the unit - files in the configuration tree, but does not start - them. The latter equals starting them, but does not - necessarily require them to be enabled. - - Note that while - systemd-install is the recommended - tool to create or remove symlinks in the systemd - configuration directory the administrator can also - create links there manually, which is particularly - useful to use configurations that deviate from the - installation suggestions included in the unit - files. - - - - Options - - The following options are understood: - - - - - - Prints a short help - text and exits. - - - - - - Enable/disable a - service even if it conflicts - with/contradicts another service. This - might have the effect of disabling - another service that was - enabled. - - - - - - Enable/disable a - system service. - - - - - - Enable/disable a - session service for the calling - user. - - - - - - Enable/disable a - session service for all - users. - - - - - - After - enabling/disabling stop/restart/stop - the unit and reload manager - configuration. Optionally, takes one - of , - , - , - or - . If - is passed the - manager will not reload its - configuration and no service will be - started or stopped after - enabling/disabling of the unit - files. If is - passed the daemon configuration is - reloaded but the unit otherwise not - started/stopped/restarted. If - is passed and - a unit is being enabled it will also - be restarted should it already be - running. If a unit is being disabled - it will be stopped should it be - running. In either case the daemon - configuration is - reloaded. is - similar to this, but the unit will - also be started if it is being enabled - and any of the units listed in - WantedBy= in the - [Install] section - of the unit file is already - activated. Finally - starts the unit - unconditionally after enabling. This - setting defaults to - . If - is - specifieed but the mode value is - omitted defaults to - . This option - has no effect when - or - test is used, or - when systemd is not running or the - command is executed in a - chroot2 - environment. This option is implied if - the realize command - is used. - - - - - - If set makes sure that - all symlinks on the specified unit are - removed from the configuration - directory and its subdirectories, not - just those specified in the - [Install] - section. - - - - - - - Show what is done as - it is done. - - - - - The following commands are understood: - - - - enable - - Enable one or more - units. This will create a number of - symlinks as encoded in the - [Install] section - of a unit file. - - - - disable - - Disable or more - units. This will remove a number of - symlinks as encoded in the - [Install] section - of a unit file. - - - - realize - - Does not enable or - disable any unit. Checks whether any - of the units specified are enabled, - and then starts/stops/restarts the - units accordingly. This will check for - the existence of a number of symlinks - as encoded in the - [Install] section - of a unit file, and then executes the - action normally specified by - . If - is not - specified implies - mode. To - override this mode specify - in - addition to - realize. - - - - test - - Does not enable or - disable any unit. Checks whether any - of the units specified are - enabled. This will check for the - existence of a number of symlinks as - encoded in the - [Install] section - of a unit file, and return with an - exit code of 0 if a unit is enabled, 1 - otherwise. - - - - - - - - Exit status - - On success 0 is returned, a non-zero failure - code otherwise. - - - - See Also - - systemd1, - systemctl1, - systemd.unit5 - - - - diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 7284524dbb..585145ab37 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -136,8 +136,8 @@ Wanted= see below. The preferred way to create symlinks in the .wants/ directory of a service is - with the - systemd-install1 + with the enable command of the + systemctl1 tool which reads information from the [Install] section of unit files. (See below.) @@ -539,7 +539,9 @@ section is not interpreted by systemd1 during runtime. It is used exclusively by the - systemd-install1 + enable and + disable commands of the + systemctl1 tool during installation of a unit: @@ -554,7 +556,7 @@ more than once, in which case all listed names are used. At installation time, - systemd-install + systemctl enable will create symlinks from these names to the unit file name. Note that this is different from the @@ -567,8 +569,8 @@ Alias= apply only if the unit has actually been installed with the - systemd-install - tool. Also, if systemd searches for a + systemctl enable + command. Also, if systemd searches for a unit, it will discover symlinked alias names as configured with Alias=, but not @@ -607,7 +609,7 @@ installed. If the user requests installation of a unit with this option configured, - systemd-install + systemctl enable will automatically install units listed in this option as well. @@ -621,7 +623,6 @@ systemd1, systemctl8, - systemd-install1, systemd.special7, systemd.service5, systemd.socket5, diff --git a/man/systemd.xml b/man/systemd.xml index c027b4f660..d2112b1bf0 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -448,9 +448,12 @@ --variable=systemdsystemconfdir returns the path of the system configuration directory. Packages - should alter the content of these directories - only with the - systemd-install1 + should alter the content of these + directories only with the + enable and + disable commands of + the + systemctl1 tool. @@ -469,11 +472,14 @@ unit files in the directory returned by pkg-config systemd --variable=systemdsessionunitdir. Global - configuration is done in the - directory reported by - pkg-config systemd + configuration is done in the directory + reported by pkg-config + systemd --variable=systemdsessionconfdir. The - systemd-install1 + enable and + disable commands of + the + systemctl1 tool can handle both global (i.e. for all users) and private (for one user) enabling/disabling of @@ -923,7 +929,6 @@ systemctl1, systemadm1, - systemd-install1, systemd-notify1, daemon7, sd-daemon7, diff --git a/src/install.c b/src/install.c deleted file mode 100644 index 2d6316aa8f..0000000000 --- a/src/install.c +++ /dev/null @@ -1,1165 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ - -/*** - This file is part of systemd. - - 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 - (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. - - You should have received a copy of the GNU General Public License - along with systemd; If not, see . -***/ - -#include -#include -#include -#include -#include -#include -#include - -#include "log.h" -#include "path-lookup.h" -#include "util.h" -#include "macro.h" -#include "strv.h" -#include "conf-parser.h" -#include "dbus-common.h" -#include "sd-daemon.h" - -static bool arg_force = false; -static bool arg_all = false; -static bool arg_verbose = false; - -static enum { - WHERE_SYSTEM, - WHERE_SESSION, - WHERE_GLOBAL, -} arg_where = WHERE_SYSTEM; - -static enum { - ACTION_INVALID, - ACTION_ENABLE, - ACTION_DISABLE, - ACTION_REALIZE, - ACTION_TEST -} arg_action = ACTION_INVALID; - -static enum { - REALIZE_NO, /* Don't reload/start/stop or anything */ - REALIZE_RELOAD, /* Only reload daemon config, don't stop/start */ - REALIZE_MINIMAL, /* Only shutdown/restart if running. */ - REALIZE_MAYBE, /* Start if WantedBy= suggests */ - REALIZE_YES /* Start unconditionally */ -} arg_realize = REALIZE_NO; - -typedef struct { - char *name; - char *path; - - char **aliases; - char **wanted_by; -} InstallInfo; - -static Hashmap *will_install = NULL, *have_installed = NULL; -static Set *remove_symlinks_to = NULL; - -static int help(void) { - - printf("%s [OPTIONS...] {COMMAND} ...\n\n" - "Install init system units.\n\n" - " -h --help Show this help\n" - " --force Override existing links\n" - " --verbose Show what is being done as it is done\n" - " --system Install into system\n" - " --session Install into session\n" - " --global Install into all sessions\n" - " --all When disabling, remove all symlinks, not\n" - " just those listed in the [Install] section\n" - " --realize[=MODE] Start/stop/restart unit after installation\n" - " Takes 'no', 'minimal', 'maybe' or 'yes'\n\n" - "Commands:\n" - " enable [NAME...] Enable one or more units\n" - " disable [NAME...] Disable one or more units\n" - " realize [NAME...] Test whether any of the specified units are enabled\n" - " and the start/stop/restart units accordingly\n" - " test [NAME...] Test whether any of the specified units are enabled\n", - program_invocation_short_name); - - return 0; -} - -static int parse_argv(int argc, char *argv[]) { - - enum { - ARG_SESSION = 0x100, - ARG_SYSTEM, - ARG_GLOBAL, - ARG_FORCE, - ARG_REALIZE, - ARG_ALL - }; - - static const struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "session", no_argument, NULL, ARG_SESSION }, - { "system", no_argument, NULL, ARG_SYSTEM }, - { "global", no_argument, NULL, ARG_GLOBAL }, - { "force", no_argument, NULL, ARG_FORCE }, - { "realize", optional_argument, NULL, ARG_REALIZE }, - { "all", no_argument, NULL, ARG_ALL }, - { "verbose", no_argument, NULL, 'v' }, - { NULL, 0, NULL, 0 } - }; - - int c; - bool realize_switch = false; - - assert(argc >= 1); - assert(argv); - - while ((c = getopt_long(argc, argv, "hv", options, NULL)) >= 0) { - - switch (c) { - - case 'h': - help(); - return 0; - - case ARG_SESSION: - arg_where = WHERE_SESSION; - break; - - case ARG_SYSTEM: - arg_where = WHERE_SYSTEM; - break; - - case ARG_GLOBAL: - arg_where = WHERE_GLOBAL; - break; - - case ARG_FORCE: - arg_force = true; - break; - - case ARG_REALIZE: - - realize_switch = true; - - if (!optarg) - arg_realize = REALIZE_MINIMAL; - else if (streq(optarg, "no")) - arg_realize = REALIZE_NO; - else if (streq(optarg, "minimal")) - arg_realize = REALIZE_MINIMAL; - else if (streq(optarg, "maybe")) - arg_realize = REALIZE_MAYBE; - else if (streq(optarg, "yes")) - arg_realize = REALIZE_YES; - else if (streq(optarg, "reload")) - arg_realize = REALIZE_RELOAD; - else { - log_error("Invalid --realize argument %s", optarg); - return -EINVAL; - } - - break; - - case ARG_ALL: - arg_all = true; - break; - - case 'v': - arg_verbose = true; - break; - - case '?': - return -EINVAL; - - default: - log_error("Unknown option code %c", c); - return -EINVAL; - } - } - - if (optind >= argc) { - help(); - return -EINVAL; - } - - if (streq(argv[optind], "enable")) - arg_action = ACTION_ENABLE; - else if (streq(argv[optind], "disable")) - arg_action = ACTION_DISABLE; - else if (streq(argv[optind], "test")) - arg_action = ACTION_TEST; - else if (streq(argv[optind], "realize")) { - arg_action = ACTION_REALIZE; - - if (!realize_switch) - arg_realize = REALIZE_MINIMAL; - } else { - log_error("Unknown verb %s.", argv[optind]); - return -EINVAL; - } - - optind++; - - if (optind >= argc) { - log_error("Missing unit name."); - return -EINVAL; - } - - - return 1; -} - -static void install_info_free(InstallInfo *i) { - assert(i); - - free(i->name); - free(i->path); - strv_free(i->aliases); - strv_free(i->wanted_by); - free(i); -} - -static void install_info_hashmap_free(Hashmap *m) { - InstallInfo *i; - - while ((i = hashmap_steal_first(m))) - install_info_free(i); - - hashmap_free(m); -} - -static bool unit_name_valid(const char *name) { - - /* This is a minimal version of unit_name_valid() from - * unit-name.c */ - - if (!*name) - return false; - - if (ignore_file(name)) - return false; - - return true; -} - -static int install_info_add(const char *name) { - InstallInfo *i; - int r; - - if (!unit_name_valid(name)) - return -EINVAL; - - if (hashmap_get(have_installed, name) || - hashmap_get(will_install, name)) - return 0; - - if (!(i = new0(InstallInfo, 1))) { - r = -ENOMEM; - goto fail; - } - - if (!(i->name = strdup(name))) { - r = -ENOMEM; - goto fail; - } - - if ((r = hashmap_put(will_install, i->name, i)) < 0) - goto fail; - - return 0; - -fail: - if (i) - install_info_free(i); - - return r; -} - -static int daemon_reload(DBusConnection *bus) { - DBusMessage *m = NULL, *reply = NULL; - DBusError error; - int r; - - assert(bus); - - dbus_error_init(&error); - - if (arg_verbose) - log_info("Reloading daemon configuration."); - - if (!(m = dbus_message_new_method_call( - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "Reload"))) { - log_error("Could not allocate message."); - return -ENOMEM; - } - - if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to reload configuration: %s", error.message); - r = -EIO; - goto finish; - } - - r = 0; - -finish: - if (m) - dbus_message_unref(m); - - if (reply) - dbus_message_unref(reply); - - dbus_error_free(&error); - - return r; -} - -static int install_info_run(DBusConnection *bus, InstallInfo *i, bool enabled) { - DBusMessage *m = NULL, *reply = NULL; - DBusError error; - int r; - const char *mode = "replace"; - - assert(bus); - assert(i); - - dbus_error_init(&error); - - if (arg_action == ACTION_ENABLE || - (arg_action == ACTION_REALIZE && enabled)) { - - if (arg_realize == REALIZE_MAYBE) { - char **k; - bool yes_please = false; - - STRV_FOREACH(k, i->wanted_by) { - DBusMessageIter sub, iter; - - const char *path, *state; - const char *interface = "org.freedesktop.systemd1.Unit"; - const char *property = "ActiveState"; - - if (!(m = dbus_message_new_method_call( - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "GetUnit"))) { - log_error("Could not allocate message."); - r = -ENOMEM; - goto finish; - } - - if (!dbus_message_append_args(m, - DBUS_TYPE_STRING, k, - DBUS_TYPE_INVALID)) { - log_error("Could not append arguments to message."); - r = -ENOMEM; - goto finish; - } - - if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - /* Hmm, this unit doesn't exist, let's try the next one */ - dbus_message_unref(m); - m = NULL; - continue; - } - - if (!dbus_message_get_args(reply, &error, - DBUS_TYPE_OBJECT_PATH, &path, - DBUS_TYPE_INVALID)) { - log_error("Failed to parse reply: %s", error.message); - r = -EIO; - goto finish; - } - - dbus_message_unref(m); - if (!(m = dbus_message_new_method_call( - "org.freedesktop.systemd1", - path, - "org.freedesktop.DBus.Properties", - "Get"))) { - log_error("Could not allocate message."); - r = -ENOMEM; - goto finish; - } - - if (!dbus_message_append_args(m, - DBUS_TYPE_STRING, &interface, - DBUS_TYPE_STRING, &property, - DBUS_TYPE_INVALID)) { - log_error("Could not append arguments to message."); - r = -ENOMEM; - goto finish; - } - - dbus_message_unref(reply); - if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); - r = -EIO; - goto finish; - } - - if (!dbus_message_iter_init(reply, &iter) || - dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) { - log_error("Failed to parse reply."); - r = -EIO; - goto finish; - } - - dbus_message_iter_recurse(&iter, &sub); - - if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRING) { - log_error("Failed to parse reply."); - r = -EIO; - goto finish; - } - - dbus_message_iter_get_basic(&sub, &state); - - dbus_message_unref(m); - dbus_message_unref(reply); - m = reply = NULL; - - if (streq(state, "active") || - startswith(state, "reloading") || - startswith(state, "activating")) { - yes_please = true; - break; - } - } - - if (!yes_please) { - r = 0; - goto finish; - } - } - - if (arg_verbose) - log_info("Restarting %s.", i->name); - - if (!(m = dbus_message_new_method_call( - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - arg_realize == REALIZE_MINIMAL ? "TryRestartUnit" : "RestartUnit"))) { - log_error("Could not allocate message."); - r = -ENOMEM; - goto finish; - } - - if (!dbus_message_append_args(m, - DBUS_TYPE_STRING, &i->name, - DBUS_TYPE_STRING, &mode, - DBUS_TYPE_INVALID)) { - log_error("Could not append arguments to message."); - r = -ENOMEM; - goto finish; - } - - - } else if (arg_action == ACTION_DISABLE || - (arg_action == ACTION_REALIZE && !enabled)) { - - if (arg_verbose) - log_info("Stopping %s.", i->name); - - if (!(m = dbus_message_new_method_call( - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "StopUnit"))) { - log_error("Could not allocate message."); - r = -ENOMEM; - goto finish; - } - - if (!dbus_message_append_args(m, - DBUS_TYPE_STRING, &i->name, - DBUS_TYPE_STRING, &mode, - DBUS_TYPE_INVALID)) { - log_error("Could not append arguments to message."); - r = -ENOMEM; - goto finish; - } - } else - assert_not_reached("install_info_run() called but nothing to do?"); - - if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to realize unit: %s", error.message); - r = -EIO; - goto finish; - } - - r = 0; - -finish: - if (m) - dbus_message_unref(m); - - if (reply) - dbus_message_unref(reply); - - dbus_error_free(&error); - - return r; -} - -static int config_parse_also( - const char *filename, - unsigned line, - const char *section, - const char *lvalue, - const char *rvalue, - void *data, - void *userdata) { - - char *w; - size_t l; - char *state; - - assert(filename); - assert(lvalue); - assert(rvalue); - - FOREACH_WORD_QUOTED(w, l, rvalue, state) { - char *n; - int r; - - if (!(n = strndup(w, l))) - return -ENOMEM; - - r = install_info_add(n); - free(n); - - if (r < 0) - return r; - } - - return 0; -} - -static int mark_symlink_for_removal(const char *p) { - char *n; - int r; - - assert(p); - assert(path_is_absolute(p)); - - if (!remove_symlinks_to) - return 0; - - if (!(n = canonicalize_file_name(p))) - if (!(n = strdup(p))) - return -ENOMEM; - - path_kill_slashes(n); - - if ((r = set_put(remove_symlinks_to, n)) < 0) { - free(n); - return r; - } - - return 0; -} - -static int remove_marked_symlinks_fd(int fd, const char *config_path, const char *root, bool *deleted) { - int r = 0; - DIR *d; - struct dirent *de; - - assert(fd >= 0); - assert(root); - assert(deleted); - - if (!(d = fdopendir(fd))) - return -errno; - - rewinddir(d); - - while ((de = readdir(d))) { - bool is_dir = false, is_link = false; - - if (ignore_file(de->d_name)) - continue; - - if (de->d_type == DT_LNK) - is_link = true; - else if (de->d_type == DT_DIR) - is_dir = true; - else if (de->d_type == DT_UNKNOWN) { - struct stat st; - - if (fstatat(fd, de->d_name, &st, AT_SYMLINK_NOFOLLOW) < 0) { - log_error("Failed to stat %s/%s: %m", root, de->d_name); - - if (r == 0) - r = -errno; - continue; - } - - is_link = S_ISLNK(st.st_mode); - is_dir = S_ISDIR(st.st_mode); - } else - continue; - - if (is_dir) { - int nfd, q; - char *p; - - if ((nfd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW)) < 0) { - log_error("Failed to open %s/%s: %m", root, de->d_name); - - if (r == 0) - r = -errno; - continue; - } - - if (asprintf(&p, "%s/%s", root, de->d_name) < 0) { - log_error("Failed to allocate directory string."); - close_nointr_nofail(nfd); - r = -ENOMEM; - break; - } - - q = remove_marked_symlinks_fd(nfd, config_path, p, deleted); - free(p); - close_nointr_nofail(nfd); - - if (r == 0) - q = r; - - } else if (is_link) { - char *p, *dest, *c; - int q; - - if (asprintf(&p, "%s/%s", root, de->d_name) < 0) { - log_error("Failed to allocate symlink string."); - r = -ENOMEM; - break; - } - - if ((q = readlink_and_make_absolute(p, &dest)) < 0) { - log_error("Cannot read symlink %s: %s", p, strerror(-q)); - free(p); - - if (r == 0) - r = q; - continue; - } - - if ((c = canonicalize_file_name(dest))) { - /* This might fail if the destination - * is already removed */ - - free(dest); - dest = c; - } - - path_kill_slashes(dest); - if (set_get(remove_symlinks_to, dest)) { - - if (arg_verbose) - log_info("rm '%s'", p); - - if (unlink(p) < 0) { - log_error("Cannot unlink symlink %s: %m", p); - - if (r == 0) - r = -errno; - } else { - rmdir_parents(p, config_path); - path_kill_slashes(p); - - if (!set_get(remove_symlinks_to, p)) { - - if ((r = mark_symlink_for_removal(p)) < 0) { - if (r == 0) - r = q; - } else - *deleted = true; - } - } - } - - free(p); - free(dest); - } - } - - return r; -} - -static int remove_marked_symlinks(const char *config_path) { - int fd, r = 0; - bool deleted; - - assert(config_path); - - if (set_size(remove_symlinks_to) <= 0) - return 0; - - if ((fd = open(config_path, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW)) < 0) - return -errno; - - do { - int q; - deleted = false; - - if ((q = remove_marked_symlinks_fd(fd, config_path, config_path, &deleted)) < 0) { - if (r == 0) - r = q; - } - } while (deleted); - - close_nointr_nofail(fd); - - return r; -} - -static int create_symlink(const char *old_path, const char *new_path) { - int r; - - assert(old_path); - assert(new_path); - - if (arg_action == ACTION_ENABLE) { - char *dest; - - mkdir_parents(new_path, 0755); - - if (symlink(old_path, new_path) >= 0) - return 0; - - if (errno != EEXIST) { - log_error("Cannot link %s to %s: %m", old_path, new_path); - return -errno; - } - - if ((r = readlink_and_make_absolute(new_path, &dest)) < 0) { - - if (errno == EINVAL) { - log_error("Cannot link %s to %s, file exists already and is not a symlink.", old_path, new_path); - return -EEXIST; - } - - log_error("readlink() failed: %s", strerror(-r)); - return r; - } - - if (streq(dest, old_path)) { - free(dest); - return 0; - } - - if (!arg_force) { - log_error("Cannot link %s to %s, symlink exists already and points to %s.", old_path, new_path, dest); - free(dest); - return -EEXIST; - } - - free(dest); - unlink(new_path); - - if (arg_verbose) - log_info("ln -s '%s' '%s'", old_path, new_path); - - if (symlink(old_path, new_path) >= 0) - return 0; - - log_error("Cannot link %s to %s: %m", old_path, new_path); - return -errno; - - } else if (arg_action == ACTION_DISABLE) { - char *dest; - - if ((r = mark_symlink_for_removal(old_path)) < 0) - return r; - - if ((r = readlink_and_make_absolute(new_path, &dest)) < 0) { - if (errno == ENOENT) - return 0; - - if (errno == EINVAL) { - log_warning("File %s not a symlink, ignoring.", old_path); - return 0; - } - - log_error("readlink() failed: %s", strerror(-r)); - return r; - } - - if (!streq(dest, old_path)) { - log_warning("File %s not a symlink to %s but points to %s, ignoring.", new_path, old_path, dest); - free(dest); - return 0; - } - - - free(dest); - - if ((r = mark_symlink_for_removal(new_path)) < 0) - return r; - - if (arg_verbose) - log_info("rm '%s'", new_path); - - if (unlink(new_path) >= 0) - return 0; - - log_error("Cannot unlink %s: %m", new_path); - return -errno; - - } else if (arg_action == ACTION_TEST || arg_action == ACTION_REALIZE) { - char *dest; - - if ((r = readlink_and_make_absolute(new_path, &dest)) < 0) { - - if (errno == ENOENT || errno == EINVAL) - return 0; - - log_error("readlink() failed: %s", strerror(-r)); - return r; - } - - if (streq(dest, old_path)) { - free(dest); - return 1; - } - - return 0; - } - - assert_not_reached("Unknown action."); -} - -static int install_info_symlink_alias(InstallInfo *i, const char *config_path) { - char **s; - char *alias_path = NULL; - int r; - - assert(i); - - STRV_FOREACH(s, i->aliases) { - - if (!unit_name_valid(*s)) { - log_error("Invalid name %s.", *s); - r = -EINVAL; - goto finish; - } - - free(alias_path); - if (!(alias_path = path_make_absolute(*s, config_path))) { - log_error("Out of memory"); - r = -ENOMEM; - goto finish; - } - - if ((r = create_symlink(i->path, alias_path)) != 0) - goto finish; - - if (arg_action == ACTION_DISABLE) - rmdir_parents(alias_path, config_path); - } - - r = 0; - -finish: - free(alias_path); - - return r; -} - -static int install_info_symlink_wants(InstallInfo *i, const char *config_path) { - char **s; - char *alias_path = NULL; - int r; - - assert(i); - - STRV_FOREACH(s, i->wanted_by) { - if (!unit_name_valid(*s)) { - log_error("Invalid name %s.", *s); - r = -EINVAL; - goto finish; - } - - free(alias_path); - alias_path = NULL; - - if (asprintf(&alias_path, "%s/%s.wants/%s", config_path, *s, i->name) < 0) { - log_error("Out of memory"); - r = -ENOMEM; - goto finish; - } - - if ((r = create_symlink(i->path, alias_path)) != 0) - goto finish; - - if (arg_action == ACTION_DISABLE) - rmdir_parents(alias_path, config_path); - } - - r = 0; - -finish: - free(alias_path); - - return r; -} - -static int install_info_apply(LookupPaths *paths, InstallInfo *i, const char *config_path) { - - const ConfigItem items[] = { - { "Alias", config_parse_strv, &i->aliases, "Install" }, - { "WantedBy", config_parse_strv, &i->wanted_by, "Install" }, - { "Also", config_parse_also, NULL, "Install" }, - - { NULL, NULL, NULL, NULL } - }; - - char **p; - char *filename = NULL; - FILE *f = NULL; - int r; - - assert(paths); - assert(i); - - STRV_FOREACH(p, paths->unit_path) { - int fd; - - if (!(filename = path_make_absolute(i->name, *p))) { - log_error("Out of memory"); - return -ENOMEM; - } - - /* Ensure that we don't follow symlinks */ - if ((fd = open(filename, O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NOCTTY)) >= 0) - if ((f = fdopen(fd, "re"))) - break; - - if (errno == ELOOP) { - log_error("Refusing to operate on symlinks, please pass unit names or absolute paths to unit files."); - free(filename); - return -errno; - } - - if (errno != ENOENT) { - log_error("Failed to open %s: %m", filename); - free(filename); - return -errno; - } - - free(filename); - filename = NULL; - } - - if (!f) { - log_error("Couldn't find %s.", i->name); - return -ENOENT; - } - - i->path = filename; - - if ((r = config_parse(filename, f, NULL, items, true, i)) < 0) { - fclose(f); - return r; - } - - fclose(f); - - if ((r = install_info_symlink_alias(i, config_path)) != 0) - return r; - - if ((r = install_info_symlink_wants(i, config_path)) != 0) - return r; - - if ((r = mark_symlink_for_removal(filename)) < 0) - return r; - - if ((r = remove_marked_symlinks(config_path)) < 0) - return r; - - return 0; -} - -static char *get_config_path(void) { - - switch (arg_where) { - - case WHERE_SYSTEM: - return strdup(SYSTEM_CONFIG_UNIT_PATH); - - case WHERE_GLOBAL: - return strdup(SESSION_CONFIG_UNIT_PATH); - - case WHERE_SESSION: { - char *p; - - if (session_config_home(&p) < 0) - return NULL; - - return p; - } - - default: - assert_not_reached("Unknown config path."); - } -} - -static int do_realize(bool enabled) { - DBusConnection *bus = NULL; - DBusError error; - int r, q; - Iterator i; - InstallInfo *j; - - dbus_error_init(&error); - - if (arg_realize == REALIZE_NO) - return 0; - - if (arg_where == WHERE_GLOBAL) { - log_warning("Warning: --realize has no effect with --global."); - return 0; - } - - if (arg_action == ACTION_TEST) { - log_warning("Warning: --realize has no effect with test."); - return 0; - } - - if (arg_where == WHERE_SYSTEM && sd_booted() <= 0) { - log_info("systemd is not running, --realize has no effect."); - return 0; - } - - if (arg_where == WHERE_SYSTEM && running_in_chroot() > 0) { - log_info("Running in a chroot() environment, --realize has no effect."); - return 0; - } - - if ((r = bus_connect(arg_where == WHERE_SESSION ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &bus, NULL, &error)) < 0) { - log_error("Failed to get D-Bus connection: %s", error.message); - goto finish; - } - - r = 0; - - if (arg_action == ACTION_ENABLE || arg_action == ACTION_REALIZE) - if ((r = daemon_reload(bus)) < 0) - goto finish; - - if (arg_realize != REALIZE_RELOAD) { - HASHMAP_FOREACH(j, have_installed, i) - if ((q = install_info_run(bus, j, enabled)) < 0) - r = q; - } - - if (arg_action == ACTION_DISABLE) - if ((q = daemon_reload(bus)) < 0) - r = q; - -finish: - if (bus) { - dbus_connection_close(bus); - dbus_connection_unref(bus); - } - - dbus_error_free(&error); - - dbus_shutdown(); - return r; -} - -int main(int argc, char *argv[]) { - int r, retval = 1, j; - LookupPaths paths; - InstallInfo *i; - char *config_path = NULL; - - zero(paths); - - log_parse_environment(); - - if ((r = parse_argv(argc, argv)) < 0) - goto finish; - else if (r == 0) { - retval = 0; - goto finish; - } - - if ((r = lookup_paths_init(&paths, arg_where == WHERE_SYSTEM ? MANAGER_SYSTEM : MANAGER_SESSION)) < 0) { - log_error("Failed to determine lookup paths: %s", strerror(-r)); - goto finish; - } - - if (!(config_path = get_config_path())) { - log_error("Failed to determine config path"); - goto finish; - } - - will_install = hashmap_new(string_hash_func, string_compare_func); - have_installed = hashmap_new(string_hash_func, string_compare_func); - - if (!will_install || !have_installed) { - log_error("Failed to allocate unit sets."); - goto finish; - } - - if (arg_all) - if (!(remove_symlinks_to = set_new(string_hash_func, string_compare_func))) { - log_error("Failed to allocate symlink sets."); - goto finish; - } - - for (j = optind; j < argc; j++) - if ((r = install_info_add(argv[j])) < 0) - goto finish; - - - while ((i = hashmap_first(will_install))) { - assert_se(hashmap_move_one(have_installed, will_install, i->name) == 0); - - if ((r = install_info_apply(&paths, i, config_path)) != 0) { - - if (r < 0) - goto finish; - - /* In test mode and found something */ - retval = 0; - break; - } - } - - if (do_realize(!retval) < 0) - goto finish; - -finish: - install_info_hashmap_free(will_install); - install_info_hashmap_free(have_installed); - - set_free_free(remove_symlinks_to); - - lookup_paths_free(&paths); - - free(config_path); - - return retval; -} diff --git a/src/systemctl.c b/src/systemctl.c index 667aeaeb96..1e3385f860 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -30,6 +30,7 @@ #include #include #include +#include #include @@ -45,20 +46,27 @@ #include "cgroup-show.h" #include "cgroup-util.h" #include "list.h" +#include "path-lookup.h" +#include "conf-parser.h" +#include "sd-daemon.h" static const char *arg_type = NULL; static char **arg_property = NULL; static bool arg_all = false; static bool arg_fail = false; static bool arg_session = false; -static bool arg_no_block = false; +static bool arg_global = false; static bool arg_immediate = false; +static bool arg_no_block = false; static bool arg_no_wtmp = false; static bool arg_no_sync = false; static bool arg_no_wall = false; +static bool arg_no_reload = false; static bool arg_dry = false; static bool arg_quiet = false; -static char arg_full = false; +static bool arg_full = false; +static bool arg_force = false; +static bool arg_defaults = false; static char **arg_wall = NULL; static enum action { ACTION_INVALID, @@ -86,6 +94,8 @@ static enum dot { static bool private_bus = false; +static int daemon_reload(DBusConnection *bus, char **args, unsigned n); + static const char *ansi_highlight(bool b) { static int t = -1; @@ -687,6 +697,9 @@ static int cancel_job(DBusConnection *bus, char **args, unsigned n) { assert(bus); assert(args); + if (n <= 1) + return daemon_reload(bus, args, n); + for (i = 1; i < n; i++) { unsigned id; const char *path; @@ -766,7 +779,7 @@ finish: return r; } -static bool unit_need_daemon_reload(DBusConnection *bus, const char *unit) { +static bool need_daemon_reload(DBusConnection *bus, const char *unit) { DBusMessage *m, *reply; dbus_bool_t b = FALSE; DBusMessageIter iter, sub; @@ -1007,7 +1020,7 @@ static int start_unit_one( goto finish; } - if (unit_need_daemon_reload(bus, name)) + if (need_daemon_reload(bus, name)) log_warning("Unit file of created job changed on disk, 'systemctl %s daemon-reload' recommended.", arg_session ? "--session" : "--system"); @@ -2653,7 +2666,7 @@ finish: return r; } -static int clear_jobs(DBusConnection *bus, char **args, unsigned n) { +static int daemon_reload(DBusConnection *bus, char **args, unsigned n) { DBusMessage *m = NULL, *reply = NULL; DBusError error; int r; @@ -2669,11 +2682,12 @@ static int clear_jobs(DBusConnection *bus, char **args, unsigned n) { assert(arg_action == ACTION_SYSTEMCTL); method = - streq(args[0], "clear-jobs") ? "ClearJobs" : - streq(args[0], "daemon-reload") ? "Reload" : + streq(args[0], "clear-jobs") || + streq(args[0], "cancel") ? "ClearJobs" : streq(args[0], "daemon-reexec") ? "Reexecute" : streq(args[0], "reset-maintenance") ? "ResetMaintenance" : - "Exit"; + streq(args[0], "daemon-exit") ? "Exit" : + "Reload"; } if (!(m = dbus_message_new_method_call( @@ -2723,7 +2737,7 @@ static int reset_maintenance(DBusConnection *bus, char **args, unsigned n) { dbus_error_init(&error); if (n <= 1) - return clear_jobs(bus, args, n); + return daemon_reload(bus, args, n); for (i = 1; i < n; i++) { @@ -2917,6 +2931,691 @@ finish: return r; } +typedef struct { + char *name; + char *path; + + char **aliases; + char **wanted_by; +} InstallInfo; + +static Hashmap *will_install = NULL, *have_installed = NULL; +static Set *remove_symlinks_to = NULL; + +static void install_info_free(InstallInfo *i) { + assert(i); + + free(i->name); + free(i->path); + strv_free(i->aliases); + strv_free(i->wanted_by); + free(i); +} + +static void install_info_hashmap_free(Hashmap *m) { + InstallInfo *i; + + while ((i = hashmap_steal_first(m))) + install_info_free(i); + + hashmap_free(m); +} + +static bool unit_name_valid(const char *name) { + + /* This is a minimal version of unit_name_valid() from + * unit-name.c */ + + if (!*name) + return false; + + if (ignore_file(name)) + return false; + + return true; +} + +static int install_info_add(const char *name) { + InstallInfo *i; + int r; + + assert(will_install); + + if (!unit_name_valid(name)) + return -EINVAL; + + if (hashmap_get(have_installed, name) || + hashmap_get(will_install, name)) + return 0; + + if (!(i = new0(InstallInfo, 1))) { + r = -ENOMEM; + goto fail; + } + + if (!(i->name = strdup(name))) { + r = -ENOMEM; + goto fail; + } + + if ((r = hashmap_put(will_install, i->name, i)) < 0) + goto fail; + + return 0; + +fail: + if (i) + install_info_free(i); + + return r; +} + +static int config_parse_also( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { + + char *w; + size_t l; + char *state; + + assert(filename); + assert(lvalue); + assert(rvalue); + + FOREACH_WORD_QUOTED(w, l, rvalue, state) { + char *n; + int r; + + if (!(n = strndup(w, l))) + return -ENOMEM; + + r = install_info_add(n); + free(n); + + if (r < 0) + return r; + } + + return 0; +} + +static int mark_symlink_for_removal(const char *p) { + char *n; + int r; + + assert(p); + assert(path_is_absolute(p)); + + if (!remove_symlinks_to) + return 0; + + if (!(n = strdup(p))) + return -ENOMEM; + + path_kill_slashes(n); + + if ((r = set_put(remove_symlinks_to, n)) < 0) { + free(n); + return r == -EEXIST ? 0 : r; + } + + return 0; +} + +static int remove_marked_symlinks_fd(int fd, const char *config_path, const char *root, bool *deleted) { + int r = 0; + DIR *d; + struct dirent *de; + + assert(fd >= 0); + assert(root); + assert(deleted); + + if (!(d = fdopendir(fd))) { + close_nointr_nofail(fd); + return -errno; + } + + rewinddir(d); + + while ((de = readdir(d))) { + bool is_dir = false, is_link = false; + + if (ignore_file(de->d_name)) + continue; + + if (de->d_type == DT_LNK) + is_link = true; + else if (de->d_type == DT_DIR) + is_dir = true; + else if (de->d_type == DT_UNKNOWN) { + struct stat st; + + if (fstatat(fd, de->d_name, &st, AT_SYMLINK_NOFOLLOW) < 0) { + log_error("Failed to stat %s/%s: %m", root, de->d_name); + + if (r == 0) + r = -errno; + continue; + } + + is_link = S_ISLNK(st.st_mode); + is_dir = S_ISDIR(st.st_mode); + } else + continue; + + if (is_dir) { + int nfd, q; + char *p; + + if ((nfd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW)) < 0) { + log_error("Failed to open %s/%s: %m", root, de->d_name); + + if (r == 0) + r = -errno; + continue; + } + + if (asprintf(&p, "%s/%s", root, de->d_name) < 0) { + log_error("Failed to allocate directory string."); + close_nointr_nofail(nfd); + r = -ENOMEM; + break; + } + + /* This will close nfd, regardless whether it succeeds or not */ + q = remove_marked_symlinks_fd(nfd, config_path, p, deleted); + free(p); + + if (r == 0) + q = r; + + } else if (is_link) { + char *p, *dest, *c; + int q; + + if (asprintf(&p, "%s/%s", root, de->d_name) < 0) { + log_error("Failed to allocate symlink string."); + r = -ENOMEM; + break; + } + + if ((q = readlink_and_make_absolute(p, &dest)) < 0) { + log_error("Cannot read symlink %s: %s", p, strerror(-q)); + free(p); + + if (r == 0) + r = q; + continue; + } + + if ((c = canonicalize_file_name(dest))) { + /* This might fail if the destination + * is already removed */ + + free(dest); + dest = c; + } + + path_kill_slashes(dest); + if (set_get(remove_symlinks_to, dest)) { + + if (!arg_quiet) + log_info("rm '%s'", p); + + if (unlink(p) < 0) { + log_error("Cannot unlink symlink %s: %m", p); + + if (r == 0) + r = -errno; + } else { + rmdir_parents(p, config_path); + path_kill_slashes(p); + + if (!set_get(remove_symlinks_to, p)) { + + if ((r = mark_symlink_for_removal(p)) < 0) { + if (r == 0) + r = q; + } else + *deleted = true; + } + } + } + + free(p); + free(dest); + } + } + + closedir(d); + + return r; +} + +static int remove_marked_symlinks(const char *config_path) { + int fd, r = 0; + bool deleted; + + assert(config_path); + + if (set_size(remove_symlinks_to) <= 0) + return 0; + + if ((fd = open(config_path, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW)) < 0) + return -errno; + + do { + int q, cfd; + deleted = false; + + if ((cfd = dup(fd)) < 0) { + r = -errno; + break; + } + + /* This takes possession of cfd and closes it */ + if ((q = remove_marked_symlinks_fd(cfd, config_path, config_path, &deleted)) < 0) { + if (r == 0) + r = q; + } + } while (deleted); + + close_nointr_nofail(fd); + + return r; +} + +static int create_symlink(const char *verb, const char *old_path, const char *new_path) { + int r; + + assert(old_path); + assert(new_path); + assert(verb); + + if (streq(verb, "enable")) { + char *dest; + + mkdir_parents(new_path, 0755); + + if (symlink(old_path, new_path) >= 0) { + + if (!arg_quiet) + log_info("ln -s '%s' '%s'", old_path, new_path); + + return 0; + } + + if (errno != EEXIST) { + log_error("Cannot link %s to %s: %m", old_path, new_path); + return -errno; + } + + if ((r = readlink_and_make_absolute(new_path, &dest)) < 0) { + + if (errno == EINVAL) { + log_error("Cannot link %s to %s, file exists already and is not a symlink.", old_path, new_path); + return -EEXIST; + } + + log_error("readlink() failed: %s", strerror(-r)); + return r; + } + + if (streq(dest, old_path)) { + free(dest); + return 0; + } + + if (!arg_force) { + log_error("Cannot link %s to %s, symlink exists already and points to %s.", old_path, new_path, dest); + free(dest); + return -EEXIST; + } + + free(dest); + unlink(new_path); + + if (!arg_quiet) + log_info("ln -s '%s' '%s'", old_path, new_path); + + if (symlink(old_path, new_path) >= 0) + return 0; + + log_error("Cannot link %s to %s: %m", old_path, new_path); + return -errno; + + } else if (streq(verb, "disable")) { + char *dest; + + if ((r = mark_symlink_for_removal(old_path)) < 0) + return r; + + if ((r = readlink_and_make_absolute(new_path, &dest)) < 0) { + if (errno == ENOENT) + return 0; + + if (errno == EINVAL) { + log_warning("File %s not a symlink, ignoring.", old_path); + return 0; + } + + log_error("readlink() failed: %s", strerror(-r)); + return r; + } + + if (!streq(dest, old_path)) { + log_warning("File %s not a symlink to %s but points to %s, ignoring.", new_path, old_path, dest); + free(dest); + return 0; + } + + free(dest); + + if ((r = mark_symlink_for_removal(new_path)) < 0) + return r; + + if (!arg_quiet) + log_info("rm '%s'", new_path); + + if (unlink(new_path) >= 0) + return 0; + + log_error("Cannot unlink %s: %m", new_path); + return -errno; + + } else if (streq(verb, "is-enabled")) { + char *dest; + + if ((r = readlink_and_make_absolute(new_path, &dest)) < 0) { + + if (errno == ENOENT || errno == EINVAL) + return 0; + + log_error("readlink() failed: %s", strerror(-r)); + return r; + } + + if (streq(dest, old_path)) { + free(dest); + return 1; + } + + return 0; + } + + assert_not_reached("Unknown action."); +} + +static int install_info_symlink_alias(const char *verb, InstallInfo *i, const char *config_path) { + char **s; + char *alias_path = NULL; + int r; + + assert(verb); + assert(i); + assert(config_path); + + STRV_FOREACH(s, i->aliases) { + + if (!unit_name_valid(*s)) { + log_error("Invalid name %s.", *s); + r = -EINVAL; + goto finish; + } + + free(alias_path); + if (!(alias_path = path_make_absolute(*s, config_path))) { + log_error("Out of memory"); + r = -ENOMEM; + goto finish; + } + + if ((r = create_symlink(verb, i->path, alias_path)) != 0) + goto finish; + + if (streq(verb, "disable")) + rmdir_parents(alias_path, config_path); + } + + r = 0; + +finish: + free(alias_path); + + return r; +} + +static int install_info_symlink_wants(const char *verb, InstallInfo *i, const char *config_path) { + char **s; + char *alias_path = NULL; + int r; + + assert(verb); + assert(i); + assert(config_path); + + STRV_FOREACH(s, i->wanted_by) { + if (!unit_name_valid(*s)) { + log_error("Invalid name %s.", *s); + r = -EINVAL; + goto finish; + } + + free(alias_path); + alias_path = NULL; + + if (asprintf(&alias_path, "%s/%s.wants/%s", config_path, *s, i->name) < 0) { + log_error("Out of memory"); + r = -ENOMEM; + goto finish; + } + + if ((r = create_symlink(verb, i->path, alias_path)) != 0) + goto finish; + + if (streq(verb, "disable")) + rmdir_parents(alias_path, config_path); + } + + r = 0; + +finish: + free(alias_path); + + return r; +} + +static int install_info_apply(const char *verb, LookupPaths *paths, InstallInfo *i, const char *config_path) { + + const ConfigItem items[] = { + { "Alias", config_parse_strv, &i->aliases, "Install" }, + { "WantedBy", config_parse_strv, &i->wanted_by, "Install" }, + { "Also", config_parse_also, NULL, "Install" }, + + { NULL, NULL, NULL, NULL } + }; + + char **p; + char *filename = NULL; + FILE *f = NULL; + int r; + + assert(paths); + assert(i); + + STRV_FOREACH(p, paths->unit_path) { + int fd; + + if (!(filename = path_make_absolute(i->name, *p))) { + log_error("Out of memory"); + return -ENOMEM; + } + + /* Ensure that we don't follow symlinks */ + if ((fd = open(filename, O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NOCTTY)) >= 0) + if ((f = fdopen(fd, "re"))) + break; + + if (errno == ELOOP) { + log_error("Refusing to operate on symlinks, please pass unit names or absolute paths to unit files."); + free(filename); + return -errno; + } + + if (errno != ENOENT) { + log_error("Failed to open %s: %m", filename); + free(filename); + return -errno; + } + + free(filename); + filename = NULL; + } + + if (!f) { + log_error("Couldn't find %s.", i->name); + return -ENOENT; + } + + i->path = filename; + + if ((r = config_parse(filename, f, NULL, items, true, i)) < 0) { + fclose(f); + return r; + } + + fclose(f); + + if ((r = install_info_symlink_alias(verb, i, config_path)) != 0) + return r; + + if ((r = install_info_symlink_wants(verb, i, config_path)) != 0) + return r; + + if ((r = mark_symlink_for_removal(filename)) < 0) + return r; + + if ((r = remove_marked_symlinks(config_path)) < 0) + return r; + + return 0; +} + +static char *get_config_path(void) { + + if (arg_session && arg_global) + return strdup(SESSION_CONFIG_UNIT_PATH); + + if (arg_session) { + char *p; + + if (session_config_home(&p) < 0) + return NULL; + + return p; + } + + return strdup(SYSTEM_CONFIG_UNIT_PATH); +} + +static int enable_unit(DBusConnection *bus, char **args, unsigned n) { + DBusError error; + int r; + LookupPaths paths; + char *config_path = NULL; + unsigned j; + InstallInfo *i; + const char *verb = args[0]; + + dbus_error_init(&error); + + zero(paths); + if ((r = lookup_paths_init(&paths, arg_session ? MANAGER_SESSION : MANAGER_SYSTEM)) < 0) { + log_error("Failed to determine lookup paths: %s", strerror(-r)); + goto finish; + } + + if (!(config_path = get_config_path())) { + log_error("Failed to determine config path"); + r = -ENOMEM; + goto finish; + } + + will_install = hashmap_new(string_hash_func, string_compare_func); + have_installed = hashmap_new(string_hash_func, string_compare_func); + + if (!will_install || !have_installed) { + log_error("Failed to allocate unit sets."); + r = -ENOMEM; + goto finish; + } + + if (!arg_defaults && streq(verb, "disable")) + if (!(remove_symlinks_to = set_new(string_hash_func, string_compare_func))) { + log_error("Failed to allocate symlink sets."); + r = -ENOMEM; + goto finish; + } + + for (j = 1; j < n; j++) + if ((r = install_info_add(args[j])) < 0) + goto finish; + + while ((i = hashmap_first(will_install))) { + int q; + + assert_se(hashmap_move_one(have_installed, will_install, i->name) == 0); + + if ((q = install_info_apply(verb, &paths, i, config_path)) != 0) { + + if (q < 0) { + if (r == 0) + r = q; + goto finish; + } + + /* In test mode and found something */ + r = 1; + break; + } + } + + if (streq(verb, "is-enabled")) + r = r > 0 ? 0 : -ENOENT; + else if (bus && + /* Don't try to reload anything if the user asked us to not do this */ + !arg_no_reload && + /* Don't try to reload anything when updating a unit globally */ + !arg_global && + /* Don't try to reload anything if we are called for system changes but the system wasn't booted with systemd */ + (arg_session || sd_booted() > 0) && + /* Don't try to reload anything if we are running in a chroot environment */ + (arg_session || running_in_chroot() <= 0) ) { + int q; + + if ((q = daemon_reload(bus, args, n)) < 0) + r = q; + } + +finish: + install_info_hashmap_free(will_install); + install_info_hashmap_free(have_installed); + + set_free_free(remove_symlinks_to); + + lookup_paths_free(&paths); + + free(config_path); + + return r; +} + static int systemctl_help(void) { printf("%s [OPTIONS...] {COMMAND} ...\n\n" @@ -2925,20 +3624,25 @@ static int systemctl_help(void) { " -t --type=TYPE List only units of a particular type\n" " -p --property=NAME Show only properties by this name\n" " -a --all Show all units/properties, including dead/empty ones\n" - " --full Don't ellipsize unit names.\n" - " --fail When installing a new job, fail if conflicting jobs are\n" + " --full Don't ellipsize unit names on output\n" + " --fail When queueing a new job, fail if conflicting jobs are\n" " pending\n" + " -q --quiet Suppress output\n" + " --no-block Do not wait until operation finished\n" " --system Connect to system bus\n" " --session Connect to session bus\n" " --order When generating graph for dot, show only order\n" - " --require When generating graph for dot, show only requirement\n" - " -q --quiet Suppress output\n" - " --no-block Do not wait until operation finished\n" - " --no-wall Don't send wall message before halt/power-off/reboot\n\n" + " --require When generating graph for dot, show only requirement\n" + " --no-wall Don't send wall message before halt/power-off/reboot\n" + " --global Enable/disable unit files globally\n" + " --no-reload When enabling/disabling unit files, don't reload daemon\n" + " configuration\n" + " --force When enabling unit files, override existing symlinks\n" + " --defaults When disabling unit files, remove default symlinks only\n\n" "Commands:\n" " list-units List units\n" - " start [NAME...] Start one or more units\n" - " stop [NAME...] Stop one or more units\n" + " start [NAME...] Start (activate) one or more units\n" + " stop [NAME...] Stop (deactivate) one or more units\n" " reload [NAME...] Reload one or more units\n" " restart [NAME...] Start or restart one or more units\n" " try-restart [NAME...] Restart one or more units if active\n" @@ -2947,16 +3651,18 @@ static int systemctl_help(void) { " reload-or-try-restart [NAME...] Reload one or more units is possible,\n" " otherwise restart if active\n" " isolate [NAME] Start one unit and stop all others\n" - " check [NAME...] Check whether units are active\n" - " status [NAME...] Show status of one or more units\n" + " is-active [NAME...] Check whether units are active\n" + " status [NAME...] Show runtime status of one or more units\n" " show [NAME...|JOB...] Show properties of one or more\n" - " units/jobs/manager\n" - " reset-maintenance [NAME...] Reset maintenance state for all, one\n" + " units/jobs or the manager\n" + " reset-maintenance [NAME...] Reset maintenance state for all, one,\n" " or more units\n" + " enable [NAME...] Enable one or more unit files\n" + " disable [NAME...] Disable one or more unit files\n" + " is-enabled [NAME...] Check whether unit files are enabled\n" " load [NAME...] Load one or more units\n" " list-jobs List jobs\n" - " cancel [JOB...] Cancel one or more jobs\n" - " clear-jobs Cancel all jobs\n" + " cancel [JOB...] Cancel all, one, or more jobs\n" " monitor Monitor unit/job changes\n" " dump Dump server status\n" " dot Dump dependency graph for dot(1)\n" @@ -3050,28 +3756,36 @@ static int systemctl_parse_argv(int argc, char *argv[]) { ARG_FAIL = 0x100, ARG_SESSION, ARG_SYSTEM, + ARG_GLOBAL, ARG_NO_BLOCK, ARG_NO_WALL, ARG_ORDER, ARG_REQUIRE, - ARG_FULL + ARG_FULL, + ARG_FORCE, + ARG_NO_RELOAD, + ARG_DEFAULTS }; static const struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "type", required_argument, NULL, 't' }, - { "property", required_argument, NULL, 'p' }, - { "all", no_argument, NULL, 'a' }, - { "full", no_argument, NULL, ARG_FULL }, - { "fail", no_argument, NULL, ARG_FAIL }, - { "session", no_argument, NULL, ARG_SESSION }, - { "system", no_argument, NULL, ARG_SYSTEM }, - { "no-block", no_argument, NULL, ARG_NO_BLOCK }, - { "no-wall", no_argument, NULL, ARG_NO_WALL }, - { "quiet", no_argument, NULL, 'q' }, - { "order", no_argument, NULL, ARG_ORDER }, - { "require", no_argument, NULL, ARG_REQUIRE }, - { NULL, 0, NULL, 0 } + { "help", no_argument, NULL, 'h' }, + { "type", required_argument, NULL, 't' }, + { "property", required_argument, NULL, 'p' }, + { "all", no_argument, NULL, 'a' }, + { "full", no_argument, NULL, ARG_FULL }, + { "fail", no_argument, NULL, ARG_FAIL }, + { "session", no_argument, NULL, ARG_SESSION }, + { "system", no_argument, NULL, ARG_SYSTEM }, + { "global", no_argument, NULL, ARG_GLOBAL }, + { "no-block", no_argument, NULL, ARG_NO_BLOCK }, + { "no-wall", no_argument, NULL, ARG_NO_WALL }, + { "quiet", no_argument, NULL, 'q' }, + { "order", no_argument, NULL, ARG_ORDER }, + { "require", no_argument, NULL, ARG_REQUIRE }, + { "force", no_argument, NULL, ARG_FORCE }, + { "no-reload", no_argument, NULL, ARG_NO_RELOAD }, + { "defaults", no_argument, NULL, ARG_DEFAULTS }, + { NULL, 0, NULL, 0 } }; int c; @@ -3147,6 +3861,23 @@ static int systemctl_parse_argv(int argc, char *argv[]) { arg_quiet = true; break; + case ARG_FORCE: + arg_force = true; + break; + + case ARG_NO_RELOAD: + arg_no_reload = true; + break; + + case ARG_GLOBAL: + arg_global = true; + arg_session = true; + break; + + case ARG_DEFAULTS: + arg_defaults = true; + break; + case '?': return -EINVAL; @@ -3638,7 +4369,7 @@ static int talk_initctl(void) { return 1; } -static int systemctl_main(DBusConnection *bus, int argc, char *argv[]) { +static int systemctl_main(DBusConnection *bus, int argc, char *argv[], DBusError *error) { static const struct { const char* verb; @@ -3650,42 +4381,46 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[]) { const int argc; int (* const dispatch)(DBusConnection *bus, char **args, unsigned n); } verbs[] = { - { "list-units", LESS, 1, list_units }, - { "list-jobs", EQUAL, 1, list_jobs }, - { "clear-jobs", EQUAL, 1, clear_jobs }, - { "load", MORE, 2, load_unit }, - { "cancel", MORE, 2, cancel_job }, - { "start", MORE, 2, start_unit }, - { "stop", MORE, 2, start_unit }, - { "reload", MORE, 2, start_unit }, - { "restart", MORE, 2, start_unit }, - { "try-restart", MORE, 2, start_unit }, - { "reload-or-restart", MORE, 2, start_unit }, - { "reload-or-try-restart", MORE, 2, start_unit }, - { "force-reload", MORE, 2, start_unit }, /* For compatibility with SysV */ - { "condrestart", MORE, 2, start_unit }, /* For compatibility with RH */ - { "isolate", EQUAL, 2, start_unit }, - { "check", MORE, 2, check_unit }, - { "show", MORE, 1, show }, - { "status", MORE, 2, show }, - { "monitor", EQUAL, 1, monitor }, - { "dump", EQUAL, 1, dump }, - { "dot", EQUAL, 1, dot }, - { "snapshot", LESS, 2, snapshot }, - { "delete", MORE, 2, delete_snapshot }, - { "daemon-reload", EQUAL, 1, clear_jobs }, - { "daemon-reexec", EQUAL, 1, clear_jobs }, - { "daemon-exit", EQUAL, 1, clear_jobs }, - { "show-environment", EQUAL, 1, show_enviroment }, - { "set-environment", MORE, 2, set_environment }, - { "unset-environment", MORE, 2, set_environment }, - { "halt", EQUAL, 1, start_special }, - { "poweroff", EQUAL, 1, start_special }, - { "reboot", EQUAL, 1, start_special }, - { "default", EQUAL, 1, start_special }, - { "rescue", EQUAL, 1, start_special }, - { "emergency", EQUAL, 1, start_special }, - { "reset-maintenance", MORE, 1, reset_maintenance }, + { "list-units", LESS, 1, list_units }, + { "list-jobs", EQUAL, 1, list_jobs }, + { "clear-jobs", EQUAL, 1, daemon_reload }, + { "load", MORE, 2, load_unit }, + { "cancel", MORE, 2, cancel_job }, + { "start", MORE, 2, start_unit }, + { "stop", MORE, 2, start_unit }, + { "reload", MORE, 2, start_unit }, + { "restart", MORE, 2, start_unit }, + { "try-restart", MORE, 2, start_unit }, + { "reload-or-restart", MORE, 2, start_unit }, + { "reload-or-try-restart", MORE, 2, start_unit }, + { "force-reload", MORE, 2, start_unit }, /* For compatibility with SysV */ + { "condrestart", MORE, 2, start_unit }, /* For compatibility with RH */ + { "isolate", EQUAL, 2, start_unit }, + { "is-active", MORE, 2, check_unit }, + { "check", MORE, 2, check_unit }, + { "show", MORE, 1, show }, + { "status", MORE, 2, show }, + { "monitor", EQUAL, 1, monitor }, + { "dump", EQUAL, 1, dump }, + { "dot", EQUAL, 1, dot }, + { "snapshot", LESS, 2, snapshot }, + { "delete", MORE, 2, delete_snapshot }, + { "daemon-reload", EQUAL, 1, daemon_reload }, + { "daemon-reexec", EQUAL, 1, daemon_reload }, + { "daemon-exit", EQUAL, 1, daemon_reload }, + { "show-environment", EQUAL, 1, show_enviroment }, + { "set-environment", MORE, 2, set_environment }, + { "unset-environment", MORE, 2, set_environment }, + { "halt", EQUAL, 1, start_special }, + { "poweroff", EQUAL, 1, start_special }, + { "reboot", EQUAL, 1, start_special }, + { "default", EQUAL, 1, start_special }, + { "rescue", EQUAL, 1, start_special }, + { "emergency", EQUAL, 1, start_special }, + { "reset-maintenance", MORE, 1, reset_maintenance }, + { "enable", MORE, 2, enable_unit }, + { "disable", MORE, 2, enable_unit }, + { "is-enabled", MORE, 2, enable_unit } }; int left; @@ -3694,6 +4429,7 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[]) { assert(bus); assert(argc >= 0); assert(argv); + assert(error); left = argc - optind; @@ -3746,6 +4482,15 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[]) { assert_not_reached("Unknown comparison operator."); } + /* Require a bus connection for all operations but + * enable/disable */ + if (!streq(verbs[i].verb, "enable") && + !streq(verbs[i].verb, "disable") && + !bus) { + log_error("Failed to get D-Bus connection: %s", error->message); + return -EIO; + } + return verbs[i].dispatch(bus, argv + optind, left); } @@ -3754,7 +4499,7 @@ static int reload_with_fallback(DBusConnection *bus) { if (bus) { /* First, try systemd via D-Bus. */ - if ((r = clear_jobs(bus, NULL, 0)) > 0) + if ((r = daemon_reload(bus, NULL, 0)) > 0) return 0; } @@ -3890,13 +4635,7 @@ int main(int argc, char*argv[]) { switch (arg_action) { case ACTION_SYSTEMCTL: { - - if (!bus) { - log_error("Failed to get D-Bus connection: %s", error.message); - goto finish; - } - - retval = systemctl_main(bus, argc, argv) < 0; + retval = systemctl_main(bus, argc, argv, &error) < 0; break; } -- cgit v1.2.3-54-g00ecf From 6908d3842a3b69b90106646a16f51a6b089026bd Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 6 Aug 2010 11:59:37 +0200 Subject: man: document %triggerin usage --- man/daemon.xml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index 30d39d7be1..007ec95b97 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -828,6 +828,10 @@ endif if [ $1 -eq 1 ]; then # 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 + # installation fi %preun @@ -853,6 +857,29 @@ fi systemctl1 for details. + To facilitate upgrades from a package + version that shipped only SysV init scripts to + a package version that ships both a SysV init + script and a native systemd service file, use + a fragment like the following: + + %triggerin -- foobar < 0.47.11-1 +if /sbin/chkconfig foobar ; then + /bin/systemctl enable foobar.service foobar.socket >/dev/null 2>&1 || : +fi + + Where 0.47.11-1 is the first package + version that includes the native unit + file. This fragment will ensure that the first + time the unit file is installed it will be + enabled if and only if the SysV init script is + enabled, thus making sure that the the enable + status is not changed. Note that + chkconfig is a command + specific Fedora which can be used to check + whether a SysV init script is enabled. Other + operating systems will have to use different + commands here. -- cgit v1.2.3-54-g00ecf From 485ccf9a5b68a540d1ee1e09b9dc1ca323b9c15e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 6 Aug 2010 21:36:58 +0200 Subject: man: minor man page fix --- man/daemon.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index 007ec95b97..4afe712c71 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -876,7 +876,7 @@ fi enabled, thus making sure that the the enable status is not changed. Note that chkconfig is a command - specific Fedora which can be used to check + specific to Fedora which can be used to check whether a SysV init script is enabled. Other operating systems will have to use different commands here. -- cgit v1.2.3-54-g00ecf From 0a9962a1dff86f7949185f1bcf1fb9523cbca13b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 7 Aug 2010 18:09:39 +0200 Subject: man: minor man page fix --- man/daemon.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index 4afe712c71..b8e9df4900 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -873,7 +873,7 @@ fi file. This fragment will ensure that the first time the unit file is installed it will be enabled if and only if the SysV init script is - enabled, thus making sure that the the enable + enabled, thus making sure that the enable status is not changed. Note that chkconfig is a command specific to Fedora which can be used to check -- cgit v1.2.3-54-g00ecf From 20604ebc04ce5d3b7d7d63e79f94cf0febf851c5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 25 Aug 2010 03:10:13 +0200 Subject: man: minor updates --- fixme | 32 +++++++++++++++++++++++++------- man/daemon.xml | 2 +- man/telinit.xml | 4 ++-- 3 files changed, 28 insertions(+), 10 deletions(-) (limited to 'man/daemon.xml') diff --git a/fixme b/fixme index 2aa4dc6262..56efcafefa 100644 --- a/fixme +++ b/fixme @@ -58,24 +58,42 @@ * bash completion a la gdbus -* use sulogin - * [Install] section rausmachen für early boot krams, uznd per default nach /lib linken -* s/Exited/Process/ in systemctl status +* systemctl list-jobs deps anzeigen -* systemctl status: "active since 5min" +* ConditionFileExists=, ConditionKernelCommandLine=, ConditionEnvironment= mit ! -* systemctl list-jobs deps anzeigen +* oom_score_adj -* /etc/systemd/system.conf: mounten per default option +* accountsservice is dod -* ConditionFileExists=, ConditionKernelCommandLine=, ConditionEnvironment= mit ! +* follow LSB exit codes spec in "systemctl start" + +* auditd service files + +* override the human readable dbus error code for permission denied. + +* discuss reexec on shutdown, async. vs. sync? + +* auto-serial-getty vs. isolate + +* add RefuseManualIsolate= (default on?) + +* add systemctl switch to dump transaction without executing it + +* shell wenn fsck im arsch is + +* system.conf/session.conf brauch ne man page External: +* make sure MountOnPlug und MountAuto und SwapOnPlug is off in Fedora + * place /etc/inittab with explaining blurb. +* pam_securetty should honour console= + * procps, psmisc, sysvinit-tools, hostname → util-linux-ng * nologin nach /var/run https://bugzilla.redhat.com/show_bug.cgi?id=624489 diff --git a/man/daemon.xml b/man/daemon.xml index b8e9df4900..fdc6a64eea 100644 --- 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 - 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 diff --git a/man/telinit.xml b/man/telinit.xml index bbf43bf5d6..fec059aa66 100644 --- a/man/telinit.xml +++ b/man/telinit.xml @@ -124,9 +124,9 @@ runlevel2.target, runlevel3.target, ... and is equivalent to - systemctl start + systemctl isolate runlevel2.target, - systemctl start + systemctl isolate runlevel3.target, ... -- cgit v1.2.3-54-g00ecf From 34f0c1a118c68bbf8c6b57006c2acee2eedd1cbd Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 13 Sep 2010 12:05:54 +0200 Subject: man: some clarifications --- man/daemon.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index fdc6a64eea..edf8e52b88 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -826,7 +826,7 @@ endif %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>&1 || : # Alternatively, just call /bin/systemctl daemon-reload here, @@ -836,16 +836,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>&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 +/bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then - # On upgrade, reload init system configuration if we changed unit files - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - # On upgrade, restart the daemon + # Optionally, on upgrade, restart the daemon /bin/systemctl try-restart foobar.service >/dev/null 2>&1 || : fi -- cgit v1.2.3-54-g00ecf From 67ff6134592205ea7d39a826bb3e6420d82d1ceb Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 13 Sep 2010 20:51:40 +0200 Subject: man: s/triggerin/triggerun/ for rpm upgrades https://bugzilla.redhat.com/show_bug.cgi?id=626966 --- man/daemon.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index edf8e52b88..dac244ca4e 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -863,7 +863,7 @@ fi script and a native systemd service file, use a fragment like the following: - %triggerin -- foobar < 0.47.11-1 + %triggerun -- foobar < 0.47.11-1 if /sbin/chkconfig foobar ; then /bin/systemctl enable foobar.service foobar.socket >/dev/null 2>&1 || : fi -- cgit v1.2.3-54-g00ecf From 20ed3656786a36f58a27901356e67d03cdd6de5e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 30 Sep 2010 02:18:55 +0200 Subject: man: fix suggested autoconf snippet --- man/daemon.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index dac244ca4e..46988ef5ec 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"]) +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 ]) This snippet allows automatic installation of the unit files on systemd -- cgit v1.2.3-54-g00ecf From b772cfe0cccbcb52d6c4fc0a51cf9dfb39ecc3be Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 19 Oct 2010 19:39:02 +0200 Subject: man: extend commenting of .spec file snippets a bit --- man/daemon.xml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index 46988ef5ec..42a7ffd8bb 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -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 + # On uninstall (not upgrade), disable and stop the units /bin/systemctl 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 -- cgit v1.2.3-54-g00ecf From af2d49f70bcff20efaf2d69aecaf4b3e898ff1fa Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 15 Nov 2010 22:12:41 +0100 Subject: drop support for MANAGER_SESSION, introduce MANAGER_USER instead --- Makefile.am | 46 +++++++++++++++++----------------- TODO | 4 --- man/daemon.xml | 6 ++--- man/systemadm.xml | 8 +++--- man/systemctl.xml | 24 +++++++++--------- man/systemd.conf.xml | 17 +++++++++++-- man/systemd.special.xml.in | 20 +++++++-------- man/systemd.xml | 53 +++++++++++++++++++++++----------------- src/dbus-manager.c | 2 +- src/dbus.c | 2 +- src/main.c | 18 +++++++------- src/manager.c | 10 ++++---- src/manager.h | 2 +- src/path-lookup.c | 28 ++++++++++----------- src/path-lookup.h | 2 +- src/sd-daemon.h | 2 +- src/service.c | 2 +- src/systemadm.vala | 10 ++++---- src/systemctl-bash-completion.sh | 2 +- src/systemctl.c | 40 +++++++++++++++--------------- systemd.pc.in | 2 +- units/session/.gitignore | 1 - units/session/Makefile | 1 - units/session/default.target | 11 --------- units/session/exit.service.in | 18 -------------- units/session/exit.target | 18 -------------- units/user/.gitignore | 1 + units/user/Makefile | 1 + units/user/default.target | 11 +++++++++ units/user/exit.service.in | 18 ++++++++++++++ units/user/exit.target | 18 ++++++++++++++ 31 files changed, 208 insertions(+), 190 deletions(-) delete mode 100644 units/session/.gitignore delete mode 120000 units/session/Makefile delete mode 100644 units/session/default.target delete mode 100644 units/session/exit.service.in delete mode 100644 units/session/exit.target create mode 100644 units/user/.gitignore create mode 120000 units/user/Makefile create mode 100644 units/user/default.target create mode 100644 units/user/exit.service.in create mode 100644 units/user/exit.target (limited to 'man/daemon.xml') diff --git a/Makefile.am b/Makefile.am index 3389f436df..8cc25306f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,9 +30,9 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d # Our own, non-special dirs pkgsysconfdir=$(sysconfdir)/systemd -sessionunitdir=$(pkgdatadir)/session +userunitdir=$(pkgdatadir)/user tmpfilesdir=$(sysconfdir)/tmpfiles.d -sessiongeneratordir=$(pkglibexecdir)/session-generators +usergeneratordir=$(pkglibexecdir)/user-generators # And these are the special ones for / rootdir=@rootdir@ @@ -49,9 +49,9 @@ AM_CPPFLAGS = \ -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \ -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \ -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \ - -DSESSION_CONFIG_FILE=\"$(pkgsysconfdir)/session.conf\" \ - -DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \ - -DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \ + -DUSER_CONFIG_FILE=\"$(pkgsysconfdir)/user.conf\" \ + -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \ + -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \ -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \ -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \ -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \ @@ -61,7 +61,7 @@ AM_CPPFLAGS = \ -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \ -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \ -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \ - -DSESSION_GENERATOR_PATH=\"$(sessiongeneratordir)\" \ + -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \ -I $(top_srcdir)/src if TARGET_GENTOO @@ -268,13 +268,13 @@ nodist_systemunit_DATA = \ units/quotacheck.service \ units/rescue.service -dist_sessionunit_DATA = \ - units/session/default.target \ - units/session/exit.target +dist_userunit_DATA = \ + units/user/default.target \ + units/user/exit.target -nodist_sessionunit_DATA = \ - units/session/remote-fs.target \ - units/session/exit.service +nodist_userunit_DATA = \ + units/user/remote-fs.target \ + units/user/exit.service EXTRA_DIST = \ units/getty@.service.m4 \ @@ -307,7 +307,7 @@ EXTRA_DIST = \ units/poweroff.service.in \ units/reboot.service.in \ units/kexec.service.in \ - units/session/exit.service.in \ + units/user/exit.service.in \ units/fsck@.service.in \ units/fsck-root.service.in \ units/quotacheck.service.in \ @@ -1008,19 +1008,19 @@ M4_PROCESS_SYSTEM = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@ -M4_PROCESS_SESSION = \ +M4_PROCESS_USER = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@ || rm $@ + $(M4) -P $(M4_DISTRO_FLAG) -DFOR_USER=1 < $< > $@ || rm $@ units/%: units/%.m4 Makefile $(M4_PROCESS_SYSTEM) -units/session/%: units/%.m4 Makefile - $(M4_PROCESS_SESSION) +units/user/%: units/%.m4 Makefile + $(M4_PROCESS_USER) CLEANFILES = \ $(nodist_systemunit_DATA) \ - $(nodist_sessionunit_DATA) \ + $(nodist_userunit_DATA) \ $(nodist_man_MANS) \ ${XML_IN_FILES:.xml.in=.html} \ $(pkgconfigdata_DATA) @@ -1105,7 +1105,7 @@ CLEANFILES += \ install-data-hook: $(MKDIR_P) -m 0755 \ $(DESTDIR)$(systemunitdir) \ - $(DESTDIR)$(sessionunitdir) \ + $(DESTDIR)$(userunitdir) \ $(DESTDIR)$(systemunitdir)/sysinit.target.wants \ $(DESTDIR)$(systemunitdir)/sockets.target.wants \ $(DESTDIR)$(systemunitdir)/basic.target.wants \ @@ -1123,11 +1123,11 @@ install-data-hook: $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \ $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \ $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \ - $(DESTDIR)$(pkgsysconfdir)/session \ + $(DESTDIR)$(pkgsysconfdir)/user \ $(DESTDIR)$(sysconfdir)/xdg/systemd ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \ - rm -f session && \ - $(LN_S) $(pkgsysconfdir)/session session ) + rm -f user && \ + $(LN_S) $(pkgsysconfdir)/user user ) ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \ rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog.socket && \ $(LN_S) ../systemd-logger.socket systemd-logger.socket && \ @@ -1167,7 +1167,7 @@ install-data-hook: $(LN_S) ../remount-rootfs.service remount-rootfs.service && \ $(LN_S) ../var-run.mount var-run.mount && \ $(LN_S) ../var-lock.mount var-lock.mount ) - ( cd $(DESTDIR)$(sessionunitdir) && \ + ( cd $(DESTDIR)$(userunitdir) && \ rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \ $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \ $(LN_S) $(systemunitdir)/sockets.target sockets.target && \ diff --git a/TODO b/TODO index 29b70115a8..945f8d998c 100644 --- a/TODO +++ b/TODO @@ -42,8 +42,6 @@ * add systemctl switch to dump transaction without executing it -* system.conf/session.conf man page - * suspend, resume * systemctl auto-pager a la git @@ -79,8 +77,6 @@ * declare /etc/os-release cross-distro standard -* rename s/session/user/g - * fix hotplug transactions External: diff --git a/man/daemon.xml b/man/daemon.xml index 42a7ffd8bb..f592e7d6e2 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -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 diff --git a/man/systemadm.xml b/man/systemadm.xml index 1377b18c2c..cefc300981 100644 --- a/man/systemadm.xml +++ b/man/systemadm.xml @@ -45,7 +45,7 @@ systemadm Graphical frontend for the systemd system - and session manager + and service manager @@ -58,7 +58,7 @@ Description systemadm is a graphical - frontend for the systemd system and session manager + frontend for the systemd system and service manager and allows introspection and control of systemd. @@ -87,10 +87,10 @@ - + Connect to the systemd - session manager of the calling + manager of the calling user. diff --git a/man/systemctl.xml b/man/systemctl.xml index 10e0f82441..844d218877 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -44,7 +44,7 @@ systemctl - Control the systemd system and session manager + Control the systemd system and service manager @@ -59,7 +59,7 @@ systemctl may be used to introspect and control the state of the systemd1 - system and session manager. + system and service manager. @@ -178,10 +178,10 @@ - + Talk to the systemd - session manager of the calling user. + manager of the calling user. @@ -224,10 +224,10 @@ When used with enable and disable, operate on the - global session configuŕation + global user configuŕation directory, thus enabling or disabling a unit file globally for all future - sessions of all users. + logins of all users. @@ -598,11 +598,11 @@ Depending on whether , - or + or is specified this enables the unit for the system, - for sessions of the calling user only - or for all future session of all + for the calling user only + or for all future logins of all users. Note that in the latter case no systemd daemon configuration is reloaded. @@ -643,7 +643,7 @@ This command honours , - , + , in a similar way as enable. @@ -942,9 +942,9 @@ Ask the systemd manager to quit. This is only - supported for session managers + supported for user service managers (i.e. in conjunction with the - option) and + option) and will fail otherwise. diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml index 399cae0a6c..6759f97814 100644 --- a/man/systemd.conf.xml +++ b/man/systemd.conf.xml @@ -49,7 +49,7 @@ system.conf - session.conf + user.conf @@ -57,7 +57,7 @@ When run as system instance systemd reads the configuration file system.conf, - otherwise session.conf. These + otherwise user.conf. These configuration files contain a few settings controlling basic manager operations. @@ -79,6 +79,7 @@ DumpCore=yes CrashShell=no ShowStatus=yes + SysVConsole=yes CrashChVT=1 Configures various @@ -99,6 +100,18 @@ process. Takes a space-separated list of CPU indexes. + + + MountAuto=yes + SwapAuto=yes + + Configures whether + systemd should automatically activate + all swap or mounts listed in + /etc/fstab, or + whether this job is left to some other + system script. + diff --git a/man/systemd.special.xml.in b/man/systemd.special.xml.in index 2855f6a25f..afe882e51f 100644 --- a/man/systemd.special.xml.in +++ b/man/systemd.special.xml.in @@ -698,9 +698,9 @@ - Special Session Units + Special User Units - When systemd runs as a service instance, the + When systemd runs as a user instance, the following special units are available, which have similar definitions as their system counterparts: default.target, @@ -719,22 +719,22 @@ A special service unit for shutting down the - session. + user service manager. Applications wanting to - terminate the session should - start this unit. If systemd - receives SIGTERM or SIGINT - when running as session daemon - it will start this - unit. + terminate the user service + manager should start this + unit. If systemd receives + SIGTERM or SIGINT when running + as user service daemon it will + start this unit. Normally, this pulls in shutdown.target which in turn should be conflicted by all units that want to be shut down on - session exit. + user service manager exit. diff --git a/man/systemd.xml b/man/systemd.xml index f434bfcc58..c6c06e57e9 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -45,7 +45,7 @@ systemd init - systemd System and Session Manager + systemd System and Service Manager @@ -60,7 +60,7 @@ Description - systemd is a system and session manager for + systemd is a system and service manager for Linux operating systems. When run as first process on boot (as PID 1), it acts as init system that brings up and maintains userspace services. @@ -77,7 +77,7 @@ When run as system instance, systemd interprets the configuration file system.conf, otherwise - session.conf. See + user.conf. See systemd.conf5 for more information. @@ -136,10 +136,10 @@ - + Tell systemd to run a - system instance (resp. session + system instance (resp. user instance), even if the process ID is not 1 (resp. is 1), i.e. systemd is not (resp. is) run as init process. @@ -159,27 +159,36 @@ - Dump core on crash. This switch has no effect when run as session instance. + Dump core on + crash. This switch has no effect when + run as user + instance. - Run shell on crash. This switch has no effect when run as session instance. + Run shell on + crash. This switch has no effect when + run as user + instance. - Ask for confirmation when spawning processes. This switch has no effect when run as session instance. + Ask for confirmation + when spawning processes. This switch + has no effect when run as user + instance. Show terse service status information while booting. This - switch has no effect when run as - session instance. Takes a boolean - argument which may be omitted - which is interpreted as + switch has no effect when run as user + instance. Takes a boolean argument + which may be omitted which is + interpreted as . @@ -188,7 +197,7 @@ Controls whether output of SysV init scripts will be directed to the console. This switch - has no effect when run as session + has no effect when run as user instance. Takes a boolean argument which may be omitted which is interpreted as @@ -489,10 +498,10 @@ - Session unit directories + User unit directories Similar rules apply - for the session unit + for the user unit directories. However, here the XDG Base Directory specification @@ -500,11 +509,11 @@ units. Applications should place their unit files in the directory returned by pkg-config systemd - --variable=systemdsessionunitdir. Global + --variable=systemduserunitdir. Global configuration is done in the directory reported by pkg-config systemd - --variable=systemdsessionconfdir. The + --variable=systemduserconfdir. The enable and disable commands of the @@ -565,12 +574,12 @@ to systemctl daemon-reexec. - systemd session managers will + systemd user managers will start the exit.target unit when this signal is received. This is mostly equivalent to - systemctl --session start + systemctl --user start exit.target. @@ -585,7 +594,7 @@ systemctl start ctl-alt-del.target. - systemd session managers + systemd user managers treat this signal the same way as SIGTERM. @@ -602,7 +611,7 @@ kbrequest.target. This signal is ignored by - systemd session + systemd user managers. @@ -757,7 +766,7 @@ $XDG_DATA_HOME $XDG_DATA_DIRS - The systemd session + The systemd user manager uses these variables in accordance to the XDG diff --git a/src/dbus-manager.c b/src/dbus-manager.c index 769035f607..d1d3b4784e 100644 --- a/src/dbus-manager.c +++ b/src/dbus-manager.c @@ -854,7 +854,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "Exit")) { if (m->running_as == MANAGER_SYSTEM) { - dbus_set_error(&error, BUS_ERROR_NOT_SUPPORTED, "Exit is only supported for session managers."); + dbus_set_error(&error, BUS_ERROR_NOT_SUPPORTED, "Exit is only supported for user service managers."); return bus_send_error_reply(m, connection, message, &error, -ENOTSUP); } diff --git a/src/dbus.c b/src/dbus.c index 4365bca7bf..66076f021c 100644 --- a/src/dbus.c +++ b/src/dbus.c @@ -864,7 +864,7 @@ static int bus_init_api(Manager *m) { if (m->running_as == MANAGER_SYSTEM && m->system_bus) m->api_bus = m->system_bus; else { - if (!(m->api_bus = dbus_bus_get_private(m->running_as == MANAGER_SESSION ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &error))) { + if (!(m->api_bus = dbus_bus_get_private(m->running_as == MANAGER_USER ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &error))) { log_debug("Failed to get API D-Bus connection, retrying later: %s", error.message); r = 0; goto fail; diff --git a/src/main.c b/src/main.c index 71e684b1bd..4bdc6763fa 100644 --- a/src/main.c +++ b/src/main.c @@ -514,7 +514,7 @@ static int parse_config_file(void) { const char *fn; int r; - fn = arg_running_as == MANAGER_SYSTEM ? SYSTEM_CONFIG_FILE : SESSION_CONFIG_FILE; + fn = arg_running_as == MANAGER_SYSTEM ? SYSTEM_CONFIG_FILE : USER_CONFIG_FILE; if (!(f = fopen(fn, "re"))) { if (errno == ENOENT) @@ -573,7 +573,7 @@ static int parse_argv(int argc, char *argv[]) { ARG_LOG_LOCATION, ARG_UNIT, ARG_SYSTEM, - ARG_SESSION, + ARG_USER, ARG_TEST, ARG_DUMP_CONFIGURATION_ITEMS, ARG_DUMP_CORE, @@ -592,7 +592,7 @@ static int parse_argv(int argc, char *argv[]) { { "log-location", optional_argument, NULL, ARG_LOG_LOCATION }, { "unit", required_argument, NULL, ARG_UNIT }, { "system", no_argument, NULL, ARG_SYSTEM }, - { "session", no_argument, NULL, ARG_SESSION }, + { "user", no_argument, NULL, ARG_USER }, { "test", no_argument, NULL, ARG_TEST }, { "help", no_argument, NULL, 'h' }, { "dump-configuration-items", no_argument, NULL, ARG_DUMP_CONFIGURATION_ITEMS }, @@ -671,8 +671,8 @@ static int parse_argv(int argc, char *argv[]) { arg_running_as = MANAGER_SYSTEM; break; - case ARG_SESSION: - arg_running_as = MANAGER_SESSION; + case ARG_USER: + arg_running_as = MANAGER_USER; break; case ARG_TEST: @@ -794,14 +794,14 @@ static int parse_argv(int argc, char *argv[]) { static int help(void) { printf("%s [OPTIONS...]\n\n" - "Starts up and maintains the system or a session.\n\n" + "Starts up and maintains the system or user services.\n\n" " -h --help Show this help\n" " --test Determine startup sequence, dump it and exit\n" " --dump-configuration-items Dump understood unit configuration items\n" " --introspect[=INTERFACE] Extract D-Bus interface data\n" " --unit=UNIT Set default unit\n" " --system Run a system instance, even if PID != 1\n" - " --session Run a session instance\n" + " --user Run a user instance\n" " --dump-core Dump core on crash\n" " --crash-shell Run shell on crash\n" " --confirm-spawn Ask for confirmation when spawning processes\n" @@ -951,7 +951,7 @@ int main(int argc, char *argv[]) { if (label_init() < 0) goto finish; } else { - arg_running_as = MANAGER_SESSION; + arg_running_as = MANAGER_USER; log_set_target(LOG_TARGET_CONSOLE); } @@ -1235,7 +1235,7 @@ finish: if (arg_running_as == MANAGER_SYSTEM) args[i++] = "--system"; else - args[i++] = "--session"; + args[i++] = "--user"; if (arg_dump_core) args[i++] = "--dump-core"; diff --git a/src/manager.c b/src/manager.c index 204a88e791..25d85eaf11 100644 --- a/src/manager.c +++ b/src/manager.c @@ -2015,7 +2015,7 @@ static int manager_start_target(Manager *m, const char *name, JobMode mode) { dbus_error_init(&error); - log_info("Activating special unit %s", name); + log_debug("Activating special unit %s", name); if ((r = manager_add_job_by_name(m, JOB_START, name, mode, true, &error, NULL)) < 0) log_error("Failed to enqueue %s job: %s", name, bus_error(&error, r)); @@ -2839,7 +2839,7 @@ void manager_run_generators(Manager *m) { assert(m); - generator_path = m->running_as == MANAGER_SYSTEM ? SYSTEM_GENERATOR_PATH : SESSION_GENERATOR_PATH; + generator_path = m->running_as == MANAGER_SYSTEM ? SYSTEM_GENERATOR_PATH : USER_GENERATOR_PATH; if (!(d = opendir(generator_path))) { if (errno == ENOENT) @@ -2852,9 +2852,9 @@ void manager_run_generators(Manager *m) { if (!m->generator_unit_path) { char *p; char system_path[] = "/dev/.systemd/generator-XXXXXX", - session_path[] = "/tmp/systemd-generator-XXXXXX"; + user_path[] = "/tmp/systemd-generator-XXXXXX"; - if (!(p = mkdtemp(m->running_as == MANAGER_SYSTEM ? system_path : session_path))) { + if (!(p = mkdtemp(m->running_as == MANAGER_SYSTEM ? system_path : user_path))) { log_error("Failed to generate generator directory: %m"); goto finish; } @@ -2990,7 +2990,7 @@ void manager_undo_generators(Manager *m) { static const char* const manager_running_as_table[_MANAGER_RUNNING_AS_MAX] = { [MANAGER_SYSTEM] = "system", - [MANAGER_SESSION] = "session" + [MANAGER_USER] = "user" }; DEFINE_STRING_TABLE_LOOKUP(manager_running_as, ManagerRunningAs); diff --git a/src/manager.h b/src/manager.h index e61194ad41..c7ace2dd5e 100644 --- a/src/manager.h +++ b/src/manager.h @@ -51,7 +51,7 @@ typedef enum ManagerExitCode { typedef enum ManagerRunningAs { MANAGER_SYSTEM, - MANAGER_SESSION, + MANAGER_USER, _MANAGER_RUNNING_AS_MAX, _MANAGER_RUNNING_AS_INVALID = -1 } ManagerRunningAs; diff --git a/src/path-lookup.c b/src/path-lookup.c index c746e5e1ad..f094969ada 100644 --- a/src/path-lookup.c +++ b/src/path-lookup.c @@ -30,11 +30,11 @@ #include "path-lookup.h" -int session_config_home(char **config_home) { +int user_config_home(char **config_home) { const char *e; if ((e = getenv("XDG_CONFIG_HOME"))) { - if (asprintf(config_home, "%s/systemd/session", e) < 0) + if (asprintf(config_home, "%s/systemd/user", e) < 0) return -ENOMEM; return 1; @@ -42,7 +42,7 @@ int session_config_home(char **config_home) { const char *home; if ((home = getenv("HOME"))) { - if (asprintf(config_home, "%s/.config/systemd/session", home) < 0) + if (asprintf(config_home, "%s/.config/systemd/user", home) < 0) return -ENOMEM; return 1; @@ -52,7 +52,7 @@ int session_config_home(char **config_home) { return 0; } -static char** session_dirs(void) { +static char** user_dirs(void) { const char *home, *e; char *config_home = NULL, *data_home = NULL; char **config_dirs = NULL, **data_dirs = NULL; @@ -67,7 +67,7 @@ static char** session_dirs(void) { * as data, and allow overriding as configuration. */ - if (session_config_home(&config_home) < 0) + if (user_config_home(&config_home) < 0) goto fail; home = getenv("HOME"); @@ -81,11 +81,11 @@ static char** session_dirs(void) { * /etc/systemd/ anyway. */ if ((e = getenv("XDG_DATA_HOME"))) { - if (asprintf(&data_home, "%s/systemd/session", e) < 0) + if (asprintf(&data_home, "%s/systemd/user", e) < 0) goto fail; } else if (home) { - if (asprintf(&data_home, "%s/.local/share/systemd/session", home) < 0) + if (asprintf(&data_home, "%s/.local/share/systemd/user", home) < 0) goto fail; /* There is really no need for two unit dirs in $HOME, @@ -96,7 +96,7 @@ static char** session_dirs(void) { * one. */ mkdir_parents(data_home, 0777); - (void) symlink("../../../.config/systemd/session", data_home); + (void) symlink("../../../.config/systemd/user", data_home); } if ((e = getenv("XDG_DATA_DIRS"))) @@ -115,12 +115,12 @@ static char** session_dirs(void) { r = t; } - if (!(t = strv_merge_concat(r, config_dirs, "/systemd/session"))) + if (!(t = strv_merge_concat(r, config_dirs, "/systemd/user"))) goto finish; strv_free(r); r = t; - if (!(t = strv_append(r, SESSION_CONFIG_UNIT_PATH))) + if (!(t = strv_append(r, USER_CONFIG_UNIT_PATH))) goto fail; strv_free(r); r = t; @@ -132,12 +132,12 @@ static char** session_dirs(void) { r = t; } - if (!(t = strv_merge_concat(r, data_dirs, "/systemd/session"))) + if (!(t = strv_merge_concat(r, data_dirs, "/systemd/user"))) goto fail; strv_free(r); r = t; - if (!(t = strv_append(r, SESSION_DATA_UNIT_PATH))) + if (!(t = strv_append(r, USER_DATA_UNIT_PATH))) goto fail; strv_free(r); r = t; @@ -176,8 +176,8 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) { /* Nothing is set, so let's figure something out. */ strv_free(p->unit_path); - if (running_as == MANAGER_SESSION) { - if (!(p->unit_path = session_dirs())) + if (running_as == MANAGER_USER) { + if (!(p->unit_path = user_dirs())) return -ENOMEM; } else if (!(p->unit_path = strv_new( diff --git a/src/path-lookup.h b/src/path-lookup.h index dca8b55e15..e06f9793d2 100644 --- a/src/path-lookup.h +++ b/src/path-lookup.h @@ -32,7 +32,7 @@ typedef struct LookupPaths { #include "manager.h" -int session_config_home(char **config_home); +int user_config_home(char **config_home); int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as); void lookup_paths_free(LookupPaths *p); diff --git a/src/sd-daemon.h b/src/sd-daemon.h index fdf3cc0354..d0a0a9459a 100644 --- a/src/sd-daemon.h +++ b/src/sd-daemon.h @@ -252,7 +252,7 @@ int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_( fine. You should NOT protect them with a call to this function. Also note that this function checks whether the system, not the user session is controlled by systemd. However the functions above work - for both session and system services. + for both user and system services. See sd_booted(3) for more information. */ diff --git a/src/service.c b/src/service.c index 0b54e5bfcf..184ddf9143 100644 --- a/src/service.c +++ b/src/service.c @@ -1014,7 +1014,7 @@ static int service_add_default_dependencies(Service *s) { if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_BASIC_TARGET, NULL, true)) < 0) return r; - } else if (s->meta.manager->running_as == MANAGER_SESSION) { + } else if (s->meta.manager->running_as == MANAGER_USER) { if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SOCKETS_TARGET, NULL, true)) < 0) return r; diff --git a/src/systemadm.vala b/src/systemadm.vala index 2f3aed205a..3a01efd3c3 100644 --- a/src/systemadm.vala +++ b/src/systemadm.vala @@ -22,7 +22,7 @@ using GLib; using DBus; using Pango; -static bool session = false; +static bool user = false; public class LeftLabel : Label { public LeftLabel(string? text = null) { @@ -103,7 +103,7 @@ public class MainWindow : Window { private ComboBox unit_type_combo_box; public MainWindow() throws DBus.Error { - title = session ? "systemd Session Manager" : "systemd System Manager"; + title = user ? "systemd User Service Manager" : "systemd System Manager"; position = WindowPosition.CENTER; set_default_size(1000, 700); set_border_width(12); @@ -297,7 +297,7 @@ public class MainWindow : Window { bbox.pack_start(cancel_button, false, true, 0); - bus = DBus.Bus.get(session ? DBus.BusType.SESSION : DBus.BusType.SYSTEM); + bus = DBus.Bus.get(user ? DBus.BusType.SESSION : DBus.BusType.SYSTEM); manager = bus.get_object( "org.freedesktop.systemd1", @@ -967,8 +967,8 @@ public class MainWindow : Window { } static const OptionEntry entries[] = { - { "session", 0, 0, OptionArg.NONE, out session, "Connect to session bus", null }, - { "system", 0, OptionFlags.REVERSE, OptionArg.NONE, out session, "Connect to system bus", null }, + { "user", 0, 0, OptionArg.NONE, out user, "Connect to user service manager", null }, + { "system", 0, OptionFlags.REVERSE, OptionArg.NONE, out user, "Connect to system manager", null }, { null } }; diff --git a/src/systemctl-bash-completion.sh b/src/systemctl-bash-completion.sh index 53f8e52aaa..3e3380c8e0 100644 --- a/src/systemctl-bash-completion.sh +++ b/src/systemctl-bash-completion.sh @@ -44,7 +44,7 @@ _systemctl () { local -A OPTS=( [STANDALONE]='--all -a --defaults --fail --force -f --full --global --help -h --no-ask-password --no-block --no-reload --no-wall - --order --require --quiet -q --session --system --version' + --order --require --quiet -q --system --user --version' [ARG]='--kill-mode --kill-who --property -p --signal -s --type -t' ) diff --git a/src/systemctl.c b/src/systemctl.c index 372b3d0ca6..9d6e012309 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -61,7 +61,7 @@ static const char *arg_type = NULL; static char **arg_property = NULL; static bool arg_all = false; static bool arg_fail = false; -static bool arg_session = false; +static bool arg_user = false; static bool arg_global = false; static bool arg_immediate = false; static bool arg_no_block = false; @@ -1234,7 +1234,7 @@ static int start_unit_one( if (need_daemon_reload(bus, name)) log_warning("Unit file of created job changed on disk, 'systemctl %s daemon-reload' recommended.", - arg_session ? "--session" : "--system"); + arg_user ? "--user" : "--system"); if (!arg_no_block) { char *p; @@ -1937,7 +1937,7 @@ static void print_status_info(UnitStatusInfo *i) { printf("\n%sWarning:%s Unit file changed on disk, 'systemctl %s daemon-reload' recommended.\n", ansi_highlight(true), ansi_highlight(false), - arg_session ? "--session" : "--system"); + arg_user ? "--user" : "--system"); } static int status_property(const char *name, DBusMessageIter *iter, UnitStatusInfo *i) { @@ -3919,13 +3919,13 @@ static int install_info_apply(const char *verb, LookupPaths *paths, InstallInfo static char *get_config_path(void) { - if (arg_session && arg_global) - return strdup(SESSION_CONFIG_UNIT_PATH); + if (arg_user && arg_global) + return strdup(USER_CONFIG_UNIT_PATH); - if (arg_session) { + if (arg_user) { char *p; - if (session_config_home(&p) < 0) + if (user_config_home(&p) < 0) return NULL; return p; @@ -3946,7 +3946,7 @@ static int enable_unit(DBusConnection *bus, char **args, unsigned n) { dbus_error_init(&error); zero(paths); - if ((r = lookup_paths_init(&paths, arg_session ? MANAGER_SESSION : MANAGER_SYSTEM)) < 0) { + if ((r = lookup_paths_init(&paths, arg_user ? MANAGER_USER : MANAGER_SYSTEM)) < 0) { log_error("Failed to determine lookup paths: %s", strerror(-r)); goto finish; } @@ -4010,9 +4010,9 @@ static int enable_unit(DBusConnection *bus, char **args, unsigned n) { /* Don't try to reload anything when updating a unit globally */ !arg_global && /* Don't try to reload anything if we are called for system changes but the system wasn't booted with systemd */ - (arg_session || sd_booted() > 0) && + (arg_user || sd_booted() > 0) && /* Don't try to reload anything if we are running in a chroot environment */ - (arg_session || running_in_chroot() <= 0) ) { + (arg_user || running_in_chroot() <= 0) ) { int q; if ((q = daemon_reload(bus, args, n)) < 0) @@ -4047,8 +4047,8 @@ static int systemctl_help(void) { " pending\n" " -q --quiet Suppress output\n" " --no-block Do not wait until operation finished\n" - " --system Connect to system bus\n" - " --session Connect to session bus\n" + " --system Connect to system manager\n" + " --user Connect to user service manager\n" " --order When generating graph for dot, show only order\n" " --require When generating graph for dot, show only requirement\n" " --no-wall Don't send wall message before halt/power-off/reboot\n" @@ -4105,7 +4105,7 @@ static int systemctl_help(void) { " poweroff Shut down and power-off the system\n" " reboot Shut down and reboot the system\n" " kexec Shut down and reboot the system with kexec\n" - " exit Ask for session termination\n", + " exit Ask for user instance termination\n", program_invocation_short_name); return 0; @@ -4182,7 +4182,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) { enum { ARG_FAIL = 0x100, ARG_VERSION, - ARG_SESSION, + ARG_USER, ARG_SYSTEM, ARG_GLOBAL, ARG_NO_BLOCK, @@ -4205,7 +4205,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) { { "all", no_argument, NULL, 'a' }, { "full", no_argument, NULL, ARG_FULL }, { "fail", no_argument, NULL, ARG_FAIL }, - { "session", no_argument, NULL, ARG_SESSION }, + { "user", no_argument, NULL, ARG_USER }, { "system", no_argument, NULL, ARG_SYSTEM }, { "global", no_argument, NULL, ARG_GLOBAL }, { "no-block", no_argument, NULL, ARG_NO_BLOCK }, @@ -4273,12 +4273,12 @@ static int systemctl_parse_argv(int argc, char *argv[]) { arg_fail = true; break; - case ARG_SESSION: - arg_session = true; + case ARG_USER: + arg_user = true; break; case ARG_SYSTEM: - arg_session = false; + arg_user = false; break; case ARG_NO_BLOCK: @@ -4315,7 +4315,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) { case ARG_GLOBAL: arg_global = true; - arg_session = true; + arg_user = true; break; case ARG_DEFAULTS: @@ -5236,7 +5236,7 @@ int main(int argc, char*argv[]) { goto finish; } - bus_connect(arg_session ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &bus, &private_bus, &error); + bus_connect(arg_user ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &bus, &private_bus, &error); switch (arg_action) { diff --git a/systemd.pc.in b/systemd.pc.in index 71a5678f8d..b5230f6bf9 100644 --- a/systemd.pc.in +++ b/systemd.pc.in @@ -13,6 +13,6 @@ systemdsystemconfdir=@pkgsysconfdir@/system systemdsessionconfdir=@pkgsysconfdir@/session Name: systemd -Description: systemd System and Session Manager +Description: systemd System and Service Manager URL: @PACKAGE_URL@ Version: @PACKAGE_VERSION@ diff --git a/units/session/.gitignore b/units/session/.gitignore deleted file mode 100644 index eeb62b32ba..0000000000 --- a/units/session/.gitignore +++ /dev/null @@ -1 +0,0 @@ -exit.service diff --git a/units/session/Makefile b/units/session/Makefile deleted file mode 120000 index 50be21181f..0000000000 --- a/units/session/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../src/Makefile \ No newline at end of file diff --git a/units/session/default.target b/units/session/default.target deleted file mode 100644 index deb310c2f7..0000000000 --- a/units/session/default.target +++ /dev/null @@ -1,11 +0,0 @@ -# This file is part of systemd. -# -# 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 -# (at your option) any later version. - -# See systemd.special(7) for details - -[Unit] -Description=Default diff --git a/units/session/exit.service.in b/units/session/exit.service.in deleted file mode 100644 index 024fbe172d..0000000000 --- a/units/session/exit.service.in +++ /dev/null @@ -1,18 +0,0 @@ -# This file is part of systemd. -# -# 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 -# (at your option) any later version. - -# See systemd.special(7) for details - -[Unit] -Description=Exit the Session -DefaultDependencies=no -Requires=shutdown.target -After=shutdown.target - -[Service] -Type=oneshot -ExecStart=@SYSTEMCTL@ --session --force exit diff --git a/units/session/exit.target b/units/session/exit.target deleted file mode 100644 index f34844c0d3..0000000000 --- a/units/session/exit.target +++ /dev/null @@ -1,18 +0,0 @@ -# This file is part of systemd. -# -# 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 -# (at your option) any later version. - -# See systemd.special(7) for details - -[Unit] -Description=Exit the Session -DefaultDependencies=no -Requires=exit.service -After=exit.service -AllowIsolate=yes - -[Install] -Alias=ctrl-alt-del.target diff --git a/units/user/.gitignore b/units/user/.gitignore new file mode 100644 index 0000000000..eeb62b32ba --- /dev/null +++ b/units/user/.gitignore @@ -0,0 +1 @@ +exit.service diff --git a/units/user/Makefile b/units/user/Makefile new file mode 120000 index 0000000000..50be21181f --- /dev/null +++ b/units/user/Makefile @@ -0,0 +1 @@ +../../src/Makefile \ No newline at end of file diff --git a/units/user/default.target b/units/user/default.target new file mode 100644 index 0000000000..deb310c2f7 --- /dev/null +++ b/units/user/default.target @@ -0,0 +1,11 @@ +# This file is part of systemd. +# +# 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 +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Default diff --git a/units/user/exit.service.in b/units/user/exit.service.in new file mode 100644 index 0000000000..a20b089c9a --- /dev/null +++ b/units/user/exit.service.in @@ -0,0 +1,18 @@ +# This file is part of systemd. +# +# 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 +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Exit the Session +DefaultDependencies=no +Requires=shutdown.target +After=shutdown.target + +[Service] +Type=oneshot +ExecStart=@SYSTEMCTL@ --user --force exit diff --git a/units/user/exit.target b/units/user/exit.target new file mode 100644 index 0000000000..f34844c0d3 --- /dev/null +++ b/units/user/exit.target @@ -0,0 +1,18 @@ +# This file is part of systemd. +# +# 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 +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Exit the Session +DefaultDependencies=no +Requires=exit.service +After=exit.service +AllowIsolate=yes + +[Install] +Alias=ctrl-alt-del.target -- cgit v1.2.3-54-g00ecf From 2dddca4a8d5d7550860ec90b401eb29735d1b846 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 16 Dec 2010 01:55:59 +0100 Subject: man: daemon - fix misspellings --- man/daemon.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index f592e7d6e2..7e7039e07a 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 -- cgit v1.2.3-54-g00ecf From d12d0e647a0bf83581e2dba4281a5b93b5428886 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 18 Feb 2011 02:25:18 +0100 Subject: man: don't do more reloads than necessary in spec files --- man/daemon.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index 7e7039e07a..ea0e6d27f5 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -841,7 +841,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 @@ -870,7 +870,7 @@ fi %triggerun -- foobar < 0.47.11-1 if /sbin/chkconfig foobar ; then - /bin/systemctl enable foobar.service foobar.socket >/dev/null 2>&1 || : + /bin/systemctl --no-reload enable foobar.service foobar.socket >/dev/null 2>&1 || : fi Where 0.47.11-1 is the first package -- cgit v1.2.3-54-g00ecf From 6221fcdf2ec74b6a71a4d59ca5ec80fa2b214c45 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 1 Mar 2011 22:18:49 +0100 Subject: man: fix chkconfig syntax to use --level 3 --- man/daemon.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index ea0e6d27f5..ab355cd593 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -869,7 +869,7 @@ fi a fragment like the following: %triggerun -- foobar < 0.47.11-1 -if /sbin/chkconfig foobar ; then +if /sbin/chkconfig --level 3 foobar ; then /bin/systemctl --no-reload enable foobar.service foobar.socket >/dev/null 2>&1 || : fi -- cgit v1.2.3-54-g00ecf From 63415a2d2b13df368cfdd9ad50184f7b77c4af9f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 16 Apr 2011 02:42:23 +0200 Subject: man: runlevel 5 is usually more comprehensive, so use it instead of 3 to detect whether a sysv service is enabled --- man/daemon.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index ab355cd593..bf454fd040 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -869,7 +869,7 @@ fi a fragment like the following: %triggerun -- foobar < 0.47.11-1 -if /sbin/chkconfig --level 3 foobar ; then +if /sbin/chkconfig --level 5 foobar ; then /bin/systemctl --no-reload enable foobar.service foobar.socket >/dev/null 2>&1 || : fi -- cgit v1.2.3-54-g00ecf From 8f28cbcdfe55bdaaa3e8f9c68f39b1369dd0e5dd Mon Sep 17 00:00:00 2001 From: "A. Costa" Date: Sat, 23 Apr 2011 21:55:24 +0200 Subject: man: Spelling fixes --- man/daemon.xml | 4 ++-- man/locale.conf.xml | 4 ++-- man/systemd-tmpfiles.xml | 2 +- man/systemd.device.xml | 2 +- man/systemd.special.xml.in | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index bf454fd040..f39d6cf64a 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -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 @@ -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 - user unit directory is left as excercise to the + user unit directory is left as an excercise for the reader.) Additionally, to ensure that diff --git a/man/locale.conf.xml b/man/locale.conf.xml index bb7e1130e2..742c5ebb2d 100644 --- a/man/locale.conf.xml +++ b/man/locale.conf.xml @@ -86,7 +86,7 @@ The locale settings configured in /etc/locale.conf are system-wide and are inherited by every service or user, unless - overriden or unset by individual programs or + overridden or unset by individual programs or individual users. Depending on the operating system other @@ -123,7 +123,7 @@ Example - German locale with english messages + German locale with English messages /etc/locale.conf: diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml index 986a442ebb..5203b84a9d 100644 --- a/man/systemd-tmpfiles.xml +++ b/man/systemd-tmpfiles.xml @@ -124,7 +124,7 @@ and in one invocation. For example, during boot the following command line is executed to ensure that all temporary and volatile - directores are removed and created according to the + directories are removed and created according to the configuration file: systemctl-tmpfiles --remove --create diff --git a/man/systemd.device.xml b/man/systemd.device.xml index 2393571c9a..63863bebdf 100644 --- a/man/systemd.device.xml +++ b/man/systemd.device.xml @@ -135,7 +135,7 @@ device disappears from the udev tree. This option is useful to support devices that initially show up in an - unitialized state in the tree, and for + uninitialized state in the tree, and for which a changed event is generated the moment they are fully set up. diff --git a/man/systemd.special.xml.in b/man/systemd.special.xml.in index efc4c32bed..ecc9ddee6a 100644 --- a/man/systemd.special.xml.in +++ b/man/systemd.special.xml.in @@ -155,7 +155,7 @@ graphical.target. The default unit systemd starts at bootup can be - overriden with the + overridden with the systemd.unit= kernel command line option. @@ -276,7 +276,7 @@ all SysV init script service units with an LSB header referring to the - $mail-transfer-argent + $mail-transfer-agent or $mail-transport-agent facilities, for compatibility @@ -415,7 +415,7 @@ runlevel2.target This is a target that is - called whever the SysV + called whenever the SysV compatibility code asks for runlevel 2. It is a good idea to make this an alias for @@ -427,7 +427,7 @@ runlevel3.target This is a target that is - called whever the SysV + called whenever the SysV compatibility code asks for runlevel 3. It is a good idea to make this an alias for @@ -441,7 +441,7 @@ runlevel4.target This is a target that is - called whever the SysV + called whenever the SysV compatibility code asks for runlevel 4. It is a good idea to make this an alias for @@ -455,7 +455,7 @@ runlevel5.target This is a target that is - called whever the SysV + called whenever the SysV compatibility code asks for runlevel 5. It is a good idea to make this an alias for -- cgit v1.2.3-54-g00ecf From 9f7dad774ebfad23269800b7096eaad087481deb Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Sat, 18 Jun 2011 16:40:20 +0300 Subject: man: Documentation spelling fixes --- man/daemon.xml | 2 +- man/pam_systemd.xml | 4 ++-- man/systemctl.xml | 4 ++-- man/systemd-ask-password.xml | 2 +- man/systemd-nspawn.xml | 4 ++-- man/systemd.exec.xml | 6 +++--- man/systemd.socket.xml | 2 +- man/systemd.swap.xml | 2 +- man/systemd.unit.xml | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index f39d6cf64a..d5a8491850 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -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 - user unit directory is left as an excercise for the + user unit directory is left as an exercise for the reader.) Additionally, to ensure that diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml index 208c7da1c4..7d5fcad631 100644 --- a/man/pam_systemd.xml +++ b/man/pam_systemd.xml @@ -250,7 +250,7 @@ cgroup will be created by default for each user logging in, in addition to the cgroup in the named 'name=systemd' - hierarchy. If ommited, defaults to an + hierarchy. If omitted, defaults to an empty list. This may be used to move user sessions into their own groups in the 'cpu' hierarchy which ensures that @@ -267,7 +267,7 @@ separated list of cgroup controllers in which hierarchies the logged in processes will be reset to the root - cgroup. If ommited, defaults to 'cpu', + cgroup. If omitted, defaults to 'cpu', meaning that a 'cpu' cgroup grouping inherited from the login manager will be reset for the processes of the diff --git a/man/systemctl.xml b/man/systemctl.xml index e9e3371ba8..a9e86ce17c 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -386,8 +386,8 @@ Execute operation - remotely. Specifiy a hostname, or - username and hostname seperated by @, + remotely. Specify a hostname, or + username and hostname separated by @, to connect to. This will use SSH to talk to the remote systemd instance. diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml index 6d142230d0..c607b1a367 100644 --- a/man/systemd-ask-password.xml +++ b/man/systemd-ask-password.xml @@ -115,7 +115,7 @@ Specify an icon name - alongside the pasword query, which may + alongside the password query, which may be used in all agents supporting graphical display. The icon name should follow the chroot1, but more powerful since it fully virtualizes the file - system hierachy, as well as the process tree, the + system hierarchy, as well as the process tree, the various IPC subsystems and the host and domain name. @@ -106,7 +106,7 @@ Note that running two systemd-nspawn containers from the same directory tree will not make processes in them - see each other. The PID namespace seperation of the + see each other. The PID namespace separation of the two containers is complete and the containers will share very few runtime objects except for the underlying file system. diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 7b4f7e39c3..9f71492bc1 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -638,7 +638,7 @@ executed process. See capabilities7 for details. Takes a whitespace - seperated list of capability names as + separated list of capability names as read by cap_from_name3. Capabilities listed will be included @@ -715,7 +715,7 @@ path for this unit is implied. This option may be used to place executed processes in arbitrary groups in - arbitrary hierachies -- which can be + arbitrary hierarchies -- which can be configured externally with additional execution limits. By default systemd will place all executed processes in separate per-unit control @@ -753,7 +753,7 @@ usual file access controls would permit this. Directories listed in InaccessibleDirectories= - will be made inaccesible for processes + will be made inaccessible for processes inside the namespace. Note that restricting access with these options does not extend to submounts of a diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 6d81f913cb..28c8dc4566 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -518,7 +518,7 @@ Broadcast= Takes a boolean value. This controls the SO_BROADCAST - option, which allows boradcast + option, which allows broadcast datagrams to be sent from this socket. Defaults to . diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index 954e94412f..ab00f9f318 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -78,7 +78,7 @@ All swap units automatically get the appropriate dependencies on the devices (resp. on the mount points - of the files) they are actived from. + of the files) they are activated from. Swap units with DefaultDependencies= enabled diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 6ad6b4a0be..39da614a82 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -610,7 +610,7 @@ verify that the specified condition is true. With ConditionPathExists= - a file existance condition can be + a file existence condition can be checked before a unit is started. If the specified absolute path name does not exist startup of a unit will not -- cgit v1.2.3-54-g00ecf From 346bce1f4cff0096177c613987cdc80fa4ec134e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 30 Aug 2011 22:42:49 +0200 Subject: stdout-bridge: rename logger to stdout-syslog-bridge to make it more descriptive --- .gitignore | 2 +- Makefile.am | 18 +- TODO | 2 - man/daemon.xml | 2 +- man/systemd.exec.xml | 3 +- man/systemd.special.xml.in | 12 +- man/systemd.xml | 4 +- src/execute.c | 4 +- src/execute.h | 2 +- src/logger.c | 694 -------------------------- src/special.h | 2 +- src/stdout-syslog-bridge.c | 694 ++++++++++++++++++++++++++ src/unit.c | 2 +- units/.gitignore | 2 +- units/systemd-logger.service.in | 20 - units/systemd-logger.socket | 21 - units/systemd-stdout-syslog-bridge.service.in | 20 + units/systemd-stdout-syslog-bridge.socket | 21 + 18 files changed, 762 insertions(+), 763 deletions(-) delete mode 100644 src/logger.c create mode 100644 src/stdout-syslog-bridge.c delete mode 100644 units/systemd-logger.service.in delete mode 100644 units/systemd-logger.socket create mode 100644 units/systemd-stdout-syslog-bridge.service.in create mode 100644 units/systemd-stdout-syslog-bridge.socket (limited to 'man/daemon.xml') diff --git a/.gitignore b/.gitignore index 6cfb3ed265..f4a8a45b4a 100644 --- a/.gitignore +++ b/.gitignore @@ -58,7 +58,7 @@ systemd-initctl systemd test-engine test-job-type -systemd-logger +systemd-stdout-syslog-bridge systemctl systemadm .dirstamp diff --git a/Makefile.am b/Makefile.am index 56446b011f..b0c1d97e63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -150,7 +150,7 @@ bin_PROGRAMS += \ endif rootlibexec_PROGRAMS = \ - systemd-logger \ + systemd-stdout-syslog-bridge \ systemd-cgroups-agent \ systemd-initctl \ systemd-update-utmp \ @@ -354,7 +354,7 @@ dist_systemunit_DATA = \ units/sockets.target \ units/swap.target \ units/systemd-initctl.socket \ - units/systemd-logger.socket \ + units/systemd-stdout-syslog-bridge.socket \ units/systemd-shutdownd.socket \ units/syslog.socket \ units/dev-hugepages.automount \ @@ -395,7 +395,7 @@ nodist_systemunit_DATA = \ units/serial-getty@.service \ units/console-shell.service \ units/systemd-initctl.service \ - units/systemd-logger.service \ + units/systemd-stdout-syslog-bridge.service \ units/systemd-shutdownd.service \ units/systemd-logind.service \ units/systemd-kmsg-syslogd.service \ @@ -458,7 +458,7 @@ EXTRA_DIST = \ units/console-shell.service.m4 \ units/rescue.service.m4 \ units/systemd-initctl.service.in \ - units/systemd-logger.service.in \ + units/systemd-stdout-syslog-bridge.service.in \ units/systemd-shutdownd.service.in \ units/systemd-logind.service.in \ units/systemd-kmsg-syslogd.service.in \ @@ -946,11 +946,11 @@ test_install_CFLAGS = \ test_install_LDADD = \ libsystemd-basic.la -systemd_logger_SOURCES = \ - src/logger.c \ +systemd_stdout_syslog_bridge_SOURCES = \ + src/stdout-syslog-bridge.c \ src/tcpwrap.c -systemd_logger_LDADD = \ +systemd_stdout_syslog_bridge_LDADD = \ libsystemd-basic.la \ libsystemd-daemon.la \ $(LIBWRAP_LIBS) @@ -1766,8 +1766,8 @@ endif rm -f user && \ $(LN_S) $(pkgsysconfdir)/user user ) ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \ - rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog.socket && \ - $(LN_S) ../systemd-logger.socket systemd-logger.socket && \ + rm -f systemd-initctl.socket systemd-stdout-syslog-bridge.socket systemd-shutdownd.socket syslog.socket && \ + $(LN_S) ../systemd-stdout-syslog-bridge.socket systemd-stdout-syslog-bridge.socket && \ $(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \ $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \ $(LN_S) ../syslog.socket syslog.socket ) diff --git a/TODO b/TODO index 56d0a9df6f..6d562eabb5 100644 --- a/TODO +++ b/TODO @@ -39,8 +39,6 @@ Features: * allow Type=simple with PIDFile= https://bugzilla.redhat.com/show_bug.cgi?id=723942 -* rename systemd-logger to systemd-stdio-syslog-bridge - * file bugs against sysklogd, syslog-ng because of StandardOuput=null * turn default stdout/stderr to syslog (after rsyslog got updated) diff --git a/man/daemon.xml b/man/daemon.xml index d5a8491850..4673794f09 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -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 diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index bf32a89b3a..c7da8e312e 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -383,7 +383,8 @@ terminal. connects standard output to the syslog3 - system logger. + system syslog + service. connects it with the kernel log buffer which is accessible via dmesg1. diff --git a/man/systemd.special.xml.in b/man/systemd.special.xml.in index 1369b4b822..218754051e 100644 --- a/man/systemd.special.xml.in +++ b/man/systemd.special.xml.in @@ -80,8 +80,8 @@ syslog.target, systemd-initctl.service, systemd-initctl.socket, - systemd-logger.service, - systemd-logger.socket, + systemd-stdout-syslog-bridge.service, + systemd-stdout-syslog-bridge.socket, time-sync.target, umount.target @@ -563,7 +563,7 @@ - systemd-logger.service + systemd-stdout-syslog-bridge.service This is internally used by systemd to provide syslog @@ -571,15 +571,15 @@ maintains. This is a socket-activated service, see - system-logger.socket. + system-stdout-syslog-bridge.socket. - systemd-logger.socket + systemd-stdout-syslog-bridge.socket Socket activation unit for - system-logger.service. systemd + system-stdout-syslog-bridge.service. systemd will automatically add dependencies of types Requires and After to all units that diff --git a/man/systemd.xml b/man/systemd.xml index fc4810767a..d66b23027a 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -1074,10 +1074,10 @@ - /run/systemd/logger + /run/systemd/stdout-syslog-bridge Used internally by the - systemd-logger.service + systemd-stdout-syslog-bridge.service unit to connect STDOUT and/or STDERR of spawned processes to syslog3 diff --git a/src/execute.c b/src/execute.c index 1ab3218517..53e7e77fde 100644 --- a/src/execute.c +++ b/src/execute.c @@ -188,9 +188,9 @@ static int connect_logger_as(const ExecContext *context, ExecOutput output, cons zero(sa); sa.sa.sa_family = AF_UNIX; - strncpy(sa.un.sun_path, LOGGER_SOCKET, sizeof(sa.un.sun_path)); + strncpy(sa.un.sun_path, STDOUT_SYSLOG_BRIDGE_SOCKET, sizeof(sa.un.sun_path)); - if (connect(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + sizeof(LOGGER_SOCKET) - 1) < 0) { + if (connect(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + sizeof(STDOUT_SYSLOG_BRIDGE_SOCKET) - 1) < 0) { close_nointr_nofail(fd); return -errno; } diff --git a/src/execute.h b/src/execute.h index d5fb61ba26..77a2257e9b 100644 --- a/src/execute.h +++ b/src/execute.h @@ -40,7 +40,7 @@ struct CGroupAttribute; #include "list.h" #include "util.h" -#define LOGGER_SOCKET "/run/systemd/logger" +#define STDOUT_SYSLOG_BRIDGE_SOCKET "/run/systemd/stdout-syslog-bridge" typedef enum KillMode { KILL_CONTROL_GROUP = 0, diff --git a/src/logger.c b/src/logger.c deleted file mode 100644 index 435d5a7620..0000000000 --- a/src/logger.c +++ /dev/null @@ -1,694 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - 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 - (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. - - You should have received a copy of the GNU General Public License - along with systemd; If not, see . -***/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "util.h" -#include "log.h" -#include "list.h" -#include "sd-daemon.h" -#include "tcpwrap.h" -#include "def.h" - -#define STREAMS_MAX 4096 -#define SERVER_FD_MAX 16 -#define TIMEOUT_MSEC ((int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC)) - -typedef struct Stream Stream; - -typedef struct Server { - int syslog_fd; - int kmsg_fd; - int epoll_fd; - - unsigned n_server_fd; - - bool syslog_is_stream; - - LIST_HEAD(Stream, streams); - unsigned n_streams; -} Server; - -typedef enum StreamTarget { - STREAM_SYSLOG, - STREAM_KMSG -} StreamTarget; - -typedef enum StreamState { - STREAM_TARGET, - STREAM_PRIORITY, - STREAM_PROCESS, - STREAM_PREFIX, - STREAM_RUNNING -} StreamState; - -struct Stream { - Server *server; - - StreamState state; - - int fd; - - StreamTarget target; - int priority; - char *process; - pid_t pid; - uid_t uid; - gid_t gid; - - bool prefix:1; - bool tee_console:1; - - char buffer[LINE_MAX]; - size_t length; - - LIST_FIELDS(Stream, stream); -}; - -static int stream_log(Stream *s, char *p, usec_t ts) { - - char header_priority[16], header_time[64], header_pid[16]; - struct iovec iovec[5]; - int priority; - - assert(s); - assert(p); - - priority = s->priority; - - if (s->prefix) - parse_syslog_priority(&p, &priority); - - if (*p == 0) - return 0; - - /* Patch in LOG_USER facility if necessary */ - if ((priority & LOG_FACMASK) == 0) - priority = LOG_USER | LOG_PRI(priority); - - /* - * The format glibc uses to talk to the syslog daemon is: - * - * time process[pid]: msg - * - * The format the kernel uses is: - * - * msg\n - * - * We extend the latter to include the process name and pid. - */ - - snprintf(header_priority, sizeof(header_priority), "<%i>", priority); - char_array_0(header_priority); - - if (s->target == STREAM_SYSLOG) { - time_t t; - struct tm *tm; - - t = (time_t) (ts / USEC_PER_SEC); - if (!(tm = localtime(&t))) - return -EINVAL; - - if (strftime(header_time, sizeof(header_time), "%h %e %T ", tm) <= 0) - return -EINVAL; - } - - snprintf(header_pid, sizeof(header_pid), "[%lu]: ", (unsigned long) s->pid); - char_array_0(header_pid); - - zero(iovec); - IOVEC_SET_STRING(iovec[0], header_priority); - - if (s->target == STREAM_SYSLOG) { - struct msghdr msghdr; - union { - struct cmsghdr cmsghdr; - uint8_t buf[CMSG_SPACE(sizeof(struct ucred))]; - } control; - struct ucred *ucred; - - zero(control); - control.cmsghdr.cmsg_level = SOL_SOCKET; - control.cmsghdr.cmsg_type = SCM_CREDENTIALS; - control.cmsghdr.cmsg_len = CMSG_LEN(sizeof(struct ucred)); - - ucred = (struct ucred*) CMSG_DATA(&control.cmsghdr); - ucred->pid = s->pid; - ucred->uid = s->uid; - ucred->gid = s->gid; - - IOVEC_SET_STRING(iovec[1], header_time); - IOVEC_SET_STRING(iovec[2], s->process); - IOVEC_SET_STRING(iovec[3], header_pid); - IOVEC_SET_STRING(iovec[4], p); - - /* When using syslog via SOCK_STREAM separate the messages by NUL chars */ - if (s->server->syslog_is_stream) - iovec[4].iov_len++; - - zero(msghdr); - msghdr.msg_iov = iovec; - msghdr.msg_iovlen = ELEMENTSOF(iovec); - msghdr.msg_control = &control; - msghdr.msg_controllen = control.cmsghdr.cmsg_len; - - for (;;) { - ssize_t n; - - if ((n = sendmsg(s->server->syslog_fd, &msghdr, MSG_NOSIGNAL)) < 0) { - - if (errno == ESRCH) { - pid_t our_pid; - - /* Hmm, maybe the process this - * line originates from is - * dead? Then let's patch in - * our own pid and retry, - * since we have nothing - * better */ - - our_pid = getpid(); - - if (ucred->pid != our_pid) { - ucred->pid = our_pid; - continue; - } - } - - return -errno; - } - - if (!s->server->syslog_is_stream || - (size_t) n >= IOVEC_TOTAL_SIZE(iovec, ELEMENTSOF(iovec))) - break; - - IOVEC_INCREMENT(iovec, ELEMENTSOF(iovec), n); - } - - } else if (s->target == STREAM_KMSG) { - IOVEC_SET_STRING(iovec[1], s->process); - IOVEC_SET_STRING(iovec[2], header_pid); - IOVEC_SET_STRING(iovec[3], p); - IOVEC_SET_STRING(iovec[4], (char*) "\n"); - - if (writev(s->server->kmsg_fd, iovec, ELEMENTSOF(iovec)) < 0) - return -errno; - } else - assert_not_reached("Unknown log target"); - - if (s->tee_console) { - int console; - - if ((console = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC)) >= 0) { - IOVEC_SET_STRING(iovec[0], s->process); - IOVEC_SET_STRING(iovec[1], header_pid); - IOVEC_SET_STRING(iovec[2], p); - IOVEC_SET_STRING(iovec[3], (char*) "\n"); - - writev(console, iovec, 4); - } - - } - - return 0; -} - -static int stream_line(Stream *s, char *p, usec_t ts) { - int r; - - assert(s); - assert(p); - - p = strstrip(p); - - switch (s->state) { - - case STREAM_TARGET: - if (streq(p, "syslog") || streq(p, "syslog+console")) - s->target = STREAM_SYSLOG; - else if (streq(p, "kmsg") || streq(p, "kmsg+console")) { - - if (s->server->kmsg_fd >= 0 && s->uid == 0) - s->target = STREAM_KMSG; - else { - log_warning("/dev/kmsg logging not available."); - return -EPERM; - } - } else { - log_warning("Failed to parse log target line."); - return -EBADMSG; - } - - if (endswith(p, "+console")) - s->tee_console = true; - - s->state = STREAM_PRIORITY; - return 0; - - case STREAM_PRIORITY: - if ((r = safe_atoi(p, &s->priority)) < 0) { - log_warning("Failed to parse log priority line: %m"); - return r; - } - - if (s->priority < 0) { - log_warning("Log priority negative: %m"); - return -ERANGE; - } - - s->state = STREAM_PROCESS; - return 0; - - case STREAM_PROCESS: - if (!(s->process = strdup(p))) - return -ENOMEM; - - s->state = STREAM_PREFIX; - return 0; - - case STREAM_PREFIX: - - if ((r = parse_boolean(p)) < 0) - return r; - - s->prefix = r; - s->state = STREAM_RUNNING; - return 0; - - case STREAM_RUNNING: - return stream_log(s, p, ts); - } - - assert_not_reached("Unknown stream state"); -} - -static int stream_scan(Stream *s, usec_t ts) { - char *p; - size_t remaining; - int r = 0; - - assert(s); - - p = s->buffer; - remaining = s->length; - for (;;) { - char *newline; - - if (!(newline = memchr(p, '\n', remaining))) - break; - - *newline = 0; - - if ((r = stream_line(s, p, ts)) >= 0) { - remaining -= newline-p+1; - p = newline+1; - } - } - - if (p > s->buffer) { - memmove(s->buffer, p, remaining); - s->length = remaining; - } - - return r; -} - -static int stream_process(Stream *s, usec_t ts) { - ssize_t l; - int r; - assert(s); - - if ((l = read(s->fd, s->buffer+s->length, LINE_MAX-s->length)) < 0) { - - if (errno == EAGAIN) - return 0; - - log_warning("Failed to read from stream: %m"); - return -errno; - } - - - if (l == 0) - return 0; - - s->length += l; - r = stream_scan(s, ts); - - if (r < 0) - return r; - - return 1; -} - -static void stream_free(Stream *s) { - assert(s); - - if (s->server) { - assert(s->server->n_streams > 0); - s->server->n_streams--; - LIST_REMOVE(Stream, stream, s->server->streams, s); - - } - - if (s->fd >= 0) { - if (s->server) - epoll_ctl(s->server->epoll_fd, EPOLL_CTL_DEL, s->fd, NULL); - - close_nointr_nofail(s->fd); - } - - free(s->process); - free(s); -} - -static int stream_new(Server *s, int server_fd) { - Stream *stream; - int fd; - struct ucred ucred; - socklen_t len = sizeof(ucred); - struct epoll_event ev; - int r; - - assert(s); - - if ((fd = accept4(server_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC)) < 0) - return -errno; - - if (s->n_streams >= STREAMS_MAX) { - log_warning("Too many connections, refusing connection."); - close_nointr_nofail(fd); - return 0; - } - - if (!socket_tcpwrap(fd, "systemd-logger")) { - close_nointr_nofail(fd); - return 0; - } - - if (!(stream = new0(Stream, 1))) { - close_nointr_nofail(fd); - return -ENOMEM; - } - - stream->fd = fd; - - if (getsockopt(stream->fd, SOL_SOCKET, SO_PEERCRED, &ucred, &len) < 0) { - r = -errno; - goto fail; - } - - if (shutdown(fd, SHUT_WR) < 0) { - r = -errno; - goto fail; - } - - zero(ev); - ev.data.ptr = stream; - ev.events = EPOLLIN; - if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) { - r = -errno; - goto fail; - } - - stream->pid = ucred.pid; - stream->uid = ucred.uid; - stream->gid = ucred.gid; - - stream->server = s; - LIST_PREPEND(Stream, stream, s->streams, stream); - s->n_streams ++; - - return 0; - -fail: - stream_free(stream); - return r; -} - -static void server_done(Server *s) { - unsigned i; - assert(s); - - while (s->streams) - stream_free(s->streams); - - for (i = 0; i < s->n_server_fd; i++) - close_nointr_nofail(SD_LISTEN_FDS_START+i); - - if (s->syslog_fd >= 0) - close_nointr_nofail(s->syslog_fd); - - if (s->epoll_fd >= 0) - close_nointr_nofail(s->epoll_fd); - - if (s->kmsg_fd >= 0) - close_nointr_nofail(s->kmsg_fd); -} - -static int server_init(Server *s, unsigned n_sockets) { - int r; - unsigned i; - union { - struct sockaddr sa; - struct sockaddr_un un; - } sa; - - assert(s); - assert(n_sockets > 0); - - zero(*s); - - s->n_server_fd = n_sockets; - s->syslog_fd = -1; - s->kmsg_fd = -1; - - if ((s->epoll_fd = epoll_create1(EPOLL_CLOEXEC)) < 0) { - r = -errno; - log_error("Failed to create epoll object: %m"); - goto fail; - } - - for (i = 0; i < n_sockets; i++) { - struct epoll_event ev; - int fd; - - fd = SD_LISTEN_FDS_START+i; - - if ((r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1)) < 0) { - log_error("Failed to determine file descriptor type: %s", strerror(-r)); - goto fail; - } - - if (!r) { - log_error("Wrong file descriptor type."); - r = -EINVAL; - goto fail; - } - - /* We use ev.data.ptr instead of ev.data.fd here, - * since on 64bit archs fd is 32bit while a pointer is - * 64bit. To make sure we can easily distinguish fd - * values and pointer values we want to make sure to - * write the full field unconditionally. */ - - zero(ev); - ev.events = EPOLLIN; - ev.data.ptr = INT_TO_PTR(fd); - if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) { - r = -errno; - log_error("Failed to add server fd to epoll object: %m"); - goto fail; - } - } - - zero(sa); - sa.un.sun_family = AF_UNIX; - strncpy(sa.un.sun_path, "/dev/log", sizeof(sa.un.sun_path)); - - if ((s->syslog_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) { - r = -errno; - log_error("Failed to create log fd: %m"); - goto fail; - } - - if (connect(s->syslog_fd, &sa.sa, sizeof(sa)) < 0) { - close_nointr_nofail(s->syslog_fd); - - if ((s->syslog_fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0)) < 0) { - r = -errno; - log_error("Failed to create log fd: %m"); - goto fail; - } - - if (connect(s->syslog_fd, &sa.sa, sizeof(sa)) < 0) { - r = -errno; - log_error("Failed to connect log socket to /dev/log: %m"); - goto fail; - } - - s->syslog_is_stream = true; - } else - s->syslog_is_stream = false; - - /* /dev/kmsg logging is strictly optional */ - if ((s->kmsg_fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC)) < 0) - log_warning("Failed to open /dev/kmsg for logging, disabling kernel log buffer support: %m"); - - return 0; - -fail: - server_done(s); - return r; -} - -static int process_event(Server *s, struct epoll_event *ev) { - int r; - - assert(s); - - /* Yes, this is a bit ugly, we assume that that valid pointers - * are > SD_LISTEN_FDS_START+SERVER_FD_MAX. Which is certainly - * true on Linux (and probably most other OSes, too, since the - * first 4k usually are part of a separate null pointer - * dereference page. */ - - if (PTR_TO_INT(ev->data.ptr) >= SD_LISTEN_FDS_START && - PTR_TO_INT(ev->data.ptr) < SD_LISTEN_FDS_START+(int)s->n_server_fd) { - - if (ev->events != EPOLLIN) { - log_info("Got invalid event from epoll. (1)"); - return -EIO; - } - - if ((r = stream_new(s, PTR_TO_INT(ev->data.ptr))) < 0) { - log_info("Failed to accept new connection: %s", strerror(-r)); - return r; - } - - } else { - usec_t ts; - Stream *stream = ev->data.ptr; - - ts = now(CLOCK_REALTIME); - - if (!(ev->events & EPOLLIN)) { - log_info("Got invalid event from epoll. (2)"); - stream_free(stream); - return 0; - } - - if ((r = stream_process(stream, ts)) <= 0) { - - if (r < 0) - log_info("Got error on stream: %s", strerror(-r)); - - stream_free(stream); - return 0; - } - } - - return 0; -} - -int main(int argc, char *argv[]) { - Server server; - int r = EXIT_FAILURE, n; - - if (getppid() != 1) { - log_error("This program should be invoked by init only."); - return EXIT_FAILURE; - } - - if (argc > 1) { - log_error("This program does not take arguments."); - return EXIT_FAILURE; - } - - log_set_target(LOG_TARGET_SYSLOG_OR_KMSG); - log_parse_environment(); - log_open(); - - umask(0022); - - if ((n = sd_listen_fds(true)) < 0) { - log_error("Failed to read listening file descriptors from environment: %s", strerror(-r)); - return EXIT_FAILURE; - } - - if (n <= 0 || n > SERVER_FD_MAX) { - log_error("No or too many file descriptors passed."); - return EXIT_FAILURE; - } - - if (server_init(&server, (unsigned) n) < 0) - return EXIT_FAILURE; - - log_debug("systemd-logger running as pid %lu", (unsigned long) getpid()); - - sd_notify(false, - "READY=1\n" - "STATUS=Processing requests..."); - - for (;;) { - struct epoll_event event; - int k; - - if ((k = epoll_wait(server.epoll_fd, - &event, 1, - server.n_streams <= 0 ? TIMEOUT_MSEC : -1)) < 0) { - - if (errno == EINTR) - continue; - - log_error("epoll_wait() failed: %m"); - goto fail; - } - - if (k <= 0) - break; - - if (process_event(&server, &event) < 0) - goto fail; - } - - r = EXIT_SUCCESS; - - log_debug("systemd-logger stopped as pid %lu", (unsigned long) getpid()); - -fail: - sd_notify(false, - "STATUS=Shutting down..."); - - server_done(&server); - - return r; -} diff --git a/src/special.h b/src/special.h index 08dae11a25..614e53ca1b 100644 --- a/src/special.h +++ b/src/special.h @@ -68,7 +68,7 @@ /* Services systemd relies on */ #define SPECIAL_DBUS_SERVICE "dbus.service" #define SPECIAL_DBUS_SOCKET "dbus.socket" -#define SPECIAL_LOGGER_SOCKET "systemd-logger.socket" +#define SPECIAL_STDOUT_SYSLOG_BRIDGE_SOCKET "systemd-stdout-syslog-bridge.socket" #define SPECIAL_SYSLOG_SOCKET "syslog.socket" /* Magic init signals */ diff --git a/src/stdout-syslog-bridge.c b/src/stdout-syslog-bridge.c new file mode 100644 index 0000000000..48a301f6a7 --- /dev/null +++ b/src/stdout-syslog-bridge.c @@ -0,0 +1,694 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + 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 + (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. + + You should have received a copy of the GNU General Public License + along with systemd; If not, see . +***/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "util.h" +#include "log.h" +#include "list.h" +#include "sd-daemon.h" +#include "tcpwrap.h" +#include "def.h" + +#define STREAMS_MAX 4096 +#define SERVER_FD_MAX 16 +#define TIMEOUT_MSEC ((int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC)) + +typedef struct Stream Stream; + +typedef struct Server { + int syslog_fd; + int kmsg_fd; + int epoll_fd; + + unsigned n_server_fd; + + bool syslog_is_stream; + + LIST_HEAD(Stream, streams); + unsigned n_streams; +} Server; + +typedef enum StreamTarget { + STREAM_SYSLOG, + STREAM_KMSG +} StreamTarget; + +typedef enum StreamState { + STREAM_TARGET, + STREAM_PRIORITY, + STREAM_PROCESS, + STREAM_PREFIX, + STREAM_RUNNING +} StreamState; + +struct Stream { + Server *server; + + StreamState state; + + int fd; + + StreamTarget target; + int priority; + char *process; + pid_t pid; + uid_t uid; + gid_t gid; + + bool prefix:1; + bool tee_console:1; + + char buffer[LINE_MAX]; + size_t length; + + LIST_FIELDS(Stream, stream); +}; + +static int stream_log(Stream *s, char *p, usec_t ts) { + + char header_priority[16], header_time[64], header_pid[16]; + struct iovec iovec[5]; + int priority; + + assert(s); + assert(p); + + priority = s->priority; + + if (s->prefix) + parse_syslog_priority(&p, &priority); + + if (*p == 0) + return 0; + + /* Patch in LOG_USER facility if necessary */ + if ((priority & LOG_FACMASK) == 0) + priority = LOG_USER | LOG_PRI(priority); + + /* + * The format glibc uses to talk to the syslog daemon is: + * + * time process[pid]: msg + * + * The format the kernel uses is: + * + * msg\n + * + * We extend the latter to include the process name and pid. + */ + + snprintf(header_priority, sizeof(header_priority), "<%i>", priority); + char_array_0(header_priority); + + if (s->target == STREAM_SYSLOG) { + time_t t; + struct tm *tm; + + t = (time_t) (ts / USEC_PER_SEC); + if (!(tm = localtime(&t))) + return -EINVAL; + + if (strftime(header_time, sizeof(header_time), "%h %e %T ", tm) <= 0) + return -EINVAL; + } + + snprintf(header_pid, sizeof(header_pid), "[%lu]: ", (unsigned long) s->pid); + char_array_0(header_pid); + + zero(iovec); + IOVEC_SET_STRING(iovec[0], header_priority); + + if (s->target == STREAM_SYSLOG) { + struct msghdr msghdr; + union { + struct cmsghdr cmsghdr; + uint8_t buf[CMSG_SPACE(sizeof(struct ucred))]; + } control; + struct ucred *ucred; + + zero(control); + control.cmsghdr.cmsg_level = SOL_SOCKET; + control.cmsghdr.cmsg_type = SCM_CREDENTIALS; + control.cmsghdr.cmsg_len = CMSG_LEN(sizeof(struct ucred)); + + ucred = (struct ucred*) CMSG_DATA(&control.cmsghdr); + ucred->pid = s->pid; + ucred->uid = s->uid; + ucred->gid = s->gid; + + IOVEC_SET_STRING(iovec[1], header_time); + IOVEC_SET_STRING(iovec[2], s->process); + IOVEC_SET_STRING(iovec[3], header_pid); + IOVEC_SET_STRING(iovec[4], p); + + /* When using syslog via SOCK_STREAM separate the messages by NUL chars */ + if (s->server->syslog_is_stream) + iovec[4].iov_len++; + + zero(msghdr); + msghdr.msg_iov = iovec; + msghdr.msg_iovlen = ELEMENTSOF(iovec); + msghdr.msg_control = &control; + msghdr.msg_controllen = control.cmsghdr.cmsg_len; + + for (;;) { + ssize_t n; + + if ((n = sendmsg(s->server->syslog_fd, &msghdr, MSG_NOSIGNAL)) < 0) { + + if (errno == ESRCH) { + pid_t our_pid; + + /* Hmm, maybe the process this + * line originates from is + * dead? Then let's patch in + * our own pid and retry, + * since we have nothing + * better */ + + our_pid = getpid(); + + if (ucred->pid != our_pid) { + ucred->pid = our_pid; + continue; + } + } + + return -errno; + } + + if (!s->server->syslog_is_stream || + (size_t) n >= IOVEC_TOTAL_SIZE(iovec, ELEMENTSOF(iovec))) + break; + + IOVEC_INCREMENT(iovec, ELEMENTSOF(iovec), n); + } + + } else if (s->target == STREAM_KMSG) { + IOVEC_SET_STRING(iovec[1], s->process); + IOVEC_SET_STRING(iovec[2], header_pid); + IOVEC_SET_STRING(iovec[3], p); + IOVEC_SET_STRING(iovec[4], (char*) "\n"); + + if (writev(s->server->kmsg_fd, iovec, ELEMENTSOF(iovec)) < 0) + return -errno; + } else + assert_not_reached("Unknown log target"); + + if (s->tee_console) { + int console; + + if ((console = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC)) >= 0) { + IOVEC_SET_STRING(iovec[0], s->process); + IOVEC_SET_STRING(iovec[1], header_pid); + IOVEC_SET_STRING(iovec[2], p); + IOVEC_SET_STRING(iovec[3], (char*) "\n"); + + writev(console, iovec, 4); + } + + } + + return 0; +} + +static int stream_line(Stream *s, char *p, usec_t ts) { + int r; + + assert(s); + assert(p); + + p = strstrip(p); + + switch (s->state) { + + case STREAM_TARGET: + if (streq(p, "syslog") || streq(p, "syslog+console")) + s->target = STREAM_SYSLOG; + else if (streq(p, "kmsg") || streq(p, "kmsg+console")) { + + if (s->server->kmsg_fd >= 0 && s->uid == 0) + s->target = STREAM_KMSG; + else { + log_warning("/dev/kmsg logging not available."); + return -EPERM; + } + } else { + log_warning("Failed to parse log target line."); + return -EBADMSG; + } + + if (endswith(p, "+console")) + s->tee_console = true; + + s->state = STREAM_PRIORITY; + return 0; + + case STREAM_PRIORITY: + if ((r = safe_atoi(p, &s->priority)) < 0) { + log_warning("Failed to parse log priority line: %m"); + return r; + } + + if (s->priority < 0) { + log_warning("Log priority negative: %m"); + return -ERANGE; + } + + s->state = STREAM_PROCESS; + return 0; + + case STREAM_PROCESS: + if (!(s->process = strdup(p))) + return -ENOMEM; + + s->state = STREAM_PREFIX; + return 0; + + case STREAM_PREFIX: + + if ((r = parse_boolean(p)) < 0) + return r; + + s->prefix = r; + s->state = STREAM_RUNNING; + return 0; + + case STREAM_RUNNING: + return stream_log(s, p, ts); + } + + assert_not_reached("Unknown stream state"); +} + +static int stream_scan(Stream *s, usec_t ts) { + char *p; + size_t remaining; + int r = 0; + + assert(s); + + p = s->buffer; + remaining = s->length; + for (;;) { + char *newline; + + if (!(newline = memchr(p, '\n', remaining))) + break; + + *newline = 0; + + if ((r = stream_line(s, p, ts)) >= 0) { + remaining -= newline-p+1; + p = newline+1; + } + } + + if (p > s->buffer) { + memmove(s->buffer, p, remaining); + s->length = remaining; + } + + return r; +} + +static int stream_process(Stream *s, usec_t ts) { + ssize_t l; + int r; + assert(s); + + if ((l = read(s->fd, s->buffer+s->length, LINE_MAX-s->length)) < 0) { + + if (errno == EAGAIN) + return 0; + + log_warning("Failed to read from stream: %m"); + return -errno; + } + + + if (l == 0) + return 0; + + s->length += l; + r = stream_scan(s, ts); + + if (r < 0) + return r; + + return 1; +} + +static void stream_free(Stream *s) { + assert(s); + + if (s->server) { + assert(s->server->n_streams > 0); + s->server->n_streams--; + LIST_REMOVE(Stream, stream, s->server->streams, s); + + } + + if (s->fd >= 0) { + if (s->server) + epoll_ctl(s->server->epoll_fd, EPOLL_CTL_DEL, s->fd, NULL); + + close_nointr_nofail(s->fd); + } + + free(s->process); + free(s); +} + +static int stream_new(Server *s, int server_fd) { + Stream *stream; + int fd; + struct ucred ucred; + socklen_t len = sizeof(ucred); + struct epoll_event ev; + int r; + + assert(s); + + if ((fd = accept4(server_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC)) < 0) + return -errno; + + if (s->n_streams >= STREAMS_MAX) { + log_warning("Too many connections, refusing connection."); + close_nointr_nofail(fd); + return 0; + } + + if (!socket_tcpwrap(fd, "systemd-stdout-syslog-bridge")) { + close_nointr_nofail(fd); + return 0; + } + + if (!(stream = new0(Stream, 1))) { + close_nointr_nofail(fd); + return -ENOMEM; + } + + stream->fd = fd; + + if (getsockopt(stream->fd, SOL_SOCKET, SO_PEERCRED, &ucred, &len) < 0) { + r = -errno; + goto fail; + } + + if (shutdown(fd, SHUT_WR) < 0) { + r = -errno; + goto fail; + } + + zero(ev); + ev.data.ptr = stream; + ev.events = EPOLLIN; + if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) { + r = -errno; + goto fail; + } + + stream->pid = ucred.pid; + stream->uid = ucred.uid; + stream->gid = ucred.gid; + + stream->server = s; + LIST_PREPEND(Stream, stream, s->streams, stream); + s->n_streams ++; + + return 0; + +fail: + stream_free(stream); + return r; +} + +static void server_done(Server *s) { + unsigned i; + assert(s); + + while (s->streams) + stream_free(s->streams); + + for (i = 0; i < s->n_server_fd; i++) + close_nointr_nofail(SD_LISTEN_FDS_START+i); + + if (s->syslog_fd >= 0) + close_nointr_nofail(s->syslog_fd); + + if (s->epoll_fd >= 0) + close_nointr_nofail(s->epoll_fd); + + if (s->kmsg_fd >= 0) + close_nointr_nofail(s->kmsg_fd); +} + +static int server_init(Server *s, unsigned n_sockets) { + int r; + unsigned i; + union { + struct sockaddr sa; + struct sockaddr_un un; + } sa; + + assert(s); + assert(n_sockets > 0); + + zero(*s); + + s->n_server_fd = n_sockets; + s->syslog_fd = -1; + s->kmsg_fd = -1; + + if ((s->epoll_fd = epoll_create1(EPOLL_CLOEXEC)) < 0) { + r = -errno; + log_error("Failed to create epoll object: %m"); + goto fail; + } + + for (i = 0; i < n_sockets; i++) { + struct epoll_event ev; + int fd; + + fd = SD_LISTEN_FDS_START+i; + + if ((r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1)) < 0) { + log_error("Failed to determine file descriptor type: %s", strerror(-r)); + goto fail; + } + + if (!r) { + log_error("Wrong file descriptor type."); + r = -EINVAL; + goto fail; + } + + /* We use ev.data.ptr instead of ev.data.fd here, + * since on 64bit archs fd is 32bit while a pointer is + * 64bit. To make sure we can easily distinguish fd + * values and pointer values we want to make sure to + * write the full field unconditionally. */ + + zero(ev); + ev.events = EPOLLIN; + ev.data.ptr = INT_TO_PTR(fd); + if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) { + r = -errno; + log_error("Failed to add server fd to epoll object: %m"); + goto fail; + } + } + + zero(sa); + sa.un.sun_family = AF_UNIX; + strncpy(sa.un.sun_path, "/dev/log", sizeof(sa.un.sun_path)); + + if ((s->syslog_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) { + r = -errno; + log_error("Failed to create log fd: %m"); + goto fail; + } + + if (connect(s->syslog_fd, &sa.sa, sizeof(sa)) < 0) { + close_nointr_nofail(s->syslog_fd); + + if ((s->syslog_fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0)) < 0) { + r = -errno; + log_error("Failed to create log fd: %m"); + goto fail; + } + + if (connect(s->syslog_fd, &sa.sa, sizeof(sa)) < 0) { + r = -errno; + log_error("Failed to connect log socket to /dev/log: %m"); + goto fail; + } + + s->syslog_is_stream = true; + } else + s->syslog_is_stream = false; + + /* /dev/kmsg logging is strictly optional */ + if ((s->kmsg_fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC)) < 0) + log_warning("Failed to open /dev/kmsg for logging, disabling kernel log buffer support: %m"); + + return 0; + +fail: + server_done(s); + return r; +} + +static int process_event(Server *s, struct epoll_event *ev) { + int r; + + assert(s); + + /* Yes, this is a bit ugly, we assume that that valid pointers + * are > SD_LISTEN_FDS_START+SERVER_FD_MAX. Which is certainly + * true on Linux (and probably most other OSes, too, since the + * first 4k usually are part of a separate null pointer + * dereference page. */ + + if (PTR_TO_INT(ev->data.ptr) >= SD_LISTEN_FDS_START && + PTR_TO_INT(ev->data.ptr) < SD_LISTEN_FDS_START+(int)s->n_server_fd) { + + if (ev->events != EPOLLIN) { + log_info("Got invalid event from epoll. (1)"); + return -EIO; + } + + if ((r = stream_new(s, PTR_TO_INT(ev->data.ptr))) < 0) { + log_info("Failed to accept new connection: %s", strerror(-r)); + return r; + } + + } else { + usec_t ts; + Stream *stream = ev->data.ptr; + + ts = now(CLOCK_REALTIME); + + if (!(ev->events & EPOLLIN)) { + log_info("Got invalid event from epoll. (2)"); + stream_free(stream); + return 0; + } + + if ((r = stream_process(stream, ts)) <= 0) { + + if (r < 0) + log_info("Got error on stream: %s", strerror(-r)); + + stream_free(stream); + return 0; + } + } + + return 0; +} + +int main(int argc, char *argv[]) { + Server server; + int r = EXIT_FAILURE, n; + + if (getppid() != 1) { + log_error("This program should be invoked by init only."); + return EXIT_FAILURE; + } + + if (argc > 1) { + log_error("This program does not take arguments."); + return EXIT_FAILURE; + } + + log_set_target(LOG_TARGET_SYSLOG_OR_KMSG); + log_parse_environment(); + log_open(); + + umask(0022); + + if ((n = sd_listen_fds(true)) < 0) { + log_error("Failed to read listening file descriptors from environment: %s", strerror(-r)); + return EXIT_FAILURE; + } + + if (n <= 0 || n > SERVER_FD_MAX) { + log_error("No or too many file descriptors passed."); + return EXIT_FAILURE; + } + + if (server_init(&server, (unsigned) n) < 0) + return EXIT_FAILURE; + + log_debug("systemd-stdout-syslog-bridge running as pid %lu", (unsigned long) getpid()); + + sd_notify(false, + "READY=1\n" + "STATUS=Processing requests..."); + + for (;;) { + struct epoll_event event; + int k; + + if ((k = epoll_wait(server.epoll_fd, + &event, 1, + server.n_streams <= 0 ? TIMEOUT_MSEC : -1)) < 0) { + + if (errno == EINTR) + continue; + + log_error("epoll_wait() failed: %m"); + goto fail; + } + + if (k <= 0) + break; + + if (process_event(&server, &event) < 0) + goto fail; + } + + r = EXIT_SUCCESS; + + log_debug("systemd-stdout-syslog-bridge stopped as pid %lu", (unsigned long) getpid()); + +fail: + sd_notify(false, + "STATUS=Shutting down..."); + + server_done(&server); + + return r; +} diff --git a/src/unit.c b/src/unit.c index e0f4a1bb31..031e61993d 100644 --- a/src/unit.c +++ b/src/unit.c @@ -573,7 +573,7 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) { * logging daemon is run first. */ if (u->meta.manager->running_as == MANAGER_SYSTEM) - if ((r = unit_add_two_dependencies_by_name(u, UNIT_REQUIRES, UNIT_AFTER, SPECIAL_LOGGER_SOCKET, NULL, true)) < 0) + if ((r = unit_add_two_dependencies_by_name(u, UNIT_REQUIRES, UNIT_AFTER, SPECIAL_STDOUT_SYSLOG_BRIDGE_SOCKET, NULL, true)) < 0) return r; return 0; diff --git a/units/.gitignore b/units/.gitignore index ac700e8044..cc92c73022 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -33,7 +33,7 @@ systemd-shutdownd.service systemd-random-seed-load.service systemd-random-seed-save.service systemd-initctl.service -systemd-logger.service +systemd-stdout-syslog-bridge.service getty@.service systemd-update-utmp-runlevel.service systemd-update-utmp-shutdown.service diff --git a/units/systemd-logger.service.in b/units/systemd-logger.service.in deleted file mode 100644 index 5f7fe40939..0000000000 --- a/units/systemd-logger.service.in +++ /dev/null @@ -1,20 +0,0 @@ -# This file is part of systemd. -# -# 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 -# (at your option) any later version. - -# See systemd.special(7) for details - -[Unit] -Description=Stdio Syslog Bridge -DefaultDependencies=no -Requires=syslog.socket -After=syslog.socket - -[Service] -ExecStart=@rootlibexecdir@/systemd-logger -NotifyAccess=all -StandardOutput=null -CapabilityBoundingSet=CAP_SYS_ADMIN CAP_SETUID CAP_SETGID diff --git a/units/systemd-logger.socket b/units/systemd-logger.socket deleted file mode 100644 index 7178cc8246..0000000000 --- a/units/systemd-logger.socket +++ /dev/null @@ -1,21 +0,0 @@ -# This file is part of systemd. -# -# 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 -# (at your option) any later version. - -# See systemd.special(7) for details - -[Unit] -Description=Stdio Syslog Bridge Socket -DefaultDependencies=no -Before=sockets.target - -# Mount and swap units need this. If this socket unit is removed by an -# isolate request the mount and and swap units would be removed too, -# hence let's exclude this from isolate requests. -IgnoreOnIsolate=yes - -[Socket] -ListenStream=/run/systemd/logger diff --git a/units/systemd-stdout-syslog-bridge.service.in b/units/systemd-stdout-syslog-bridge.service.in new file mode 100644 index 0000000000..23a5137068 --- /dev/null +++ b/units/systemd-stdout-syslog-bridge.service.in @@ -0,0 +1,20 @@ +# This file is part of systemd. +# +# 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 +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=STDOUT Syslog Bridge +DefaultDependencies=no +Requires=syslog.socket +After=syslog.socket + +[Service] +ExecStart=@rootlibexecdir@/systemd-stdout-syslog-bridge +NotifyAccess=all +StandardOutput=null +CapabilityBoundingSet=CAP_SYS_ADMIN CAP_SETUID CAP_SETGID diff --git a/units/systemd-stdout-syslog-bridge.socket b/units/systemd-stdout-syslog-bridge.socket new file mode 100644 index 0000000000..0706efd596 --- /dev/null +++ b/units/systemd-stdout-syslog-bridge.socket @@ -0,0 +1,21 @@ +# This file is part of systemd. +# +# 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 +# (at your option) any later version. + +# See systemd.special(7) for details + +[Unit] +Description=Stdio Syslog Bridge Socket +DefaultDependencies=no +Before=sockets.target + +# Mount and swap units need this. If this socket unit is removed by an +# isolate request the mount and and swap units would be removed too, +# hence let's exclude this from isolate requests. +IgnoreOnIsolate=yes + +[Socket] +ListenStream=/run/systemd/stdout-syslog-bridge -- cgit v1.2.3-54-g00ecf From 4b7b2efb69943aae0f8287df6e28b637c50fe318 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 31 Aug 2011 01:35:43 +0200 Subject: man: don't recommend After=syslog.target anymore since we don't support non-socket-activatable syslogs anymore where that was ncessary --- man/daemon.xml | 18 ------------------ units/fedora/prefdm.service | 2 +- units/frugalware/display-manager.service | 2 +- units/mandriva/prefdm.service | 2 +- 4 files changed, 3 insertions(+), 21 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index 4673794f09..997ee5b253 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -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 diff --git a/units/fedora/prefdm.service b/units/fedora/prefdm.service index e7bd1231f8..17ed4cd786 100644 --- a/units/fedora/prefdm.service +++ b/units/fedora/prefdm.service @@ -7,7 +7,7 @@ [Unit] Description=Display Manager -After=syslog.target livesys-late.service rc-local.service systemd-user-sessions.service +After=livesys-late.service rc-local.service systemd-user-sessions.service # On Fedora gdm/X11 is on tty1. We explicitly cancel the getty here to # avoid any races around that. diff --git a/units/frugalware/display-manager.service b/units/frugalware/display-manager.service index e61422587a..2376e1977c 100644 --- a/units/frugalware/display-manager.service +++ b/units/frugalware/display-manager.service @@ -7,7 +7,7 @@ [Unit] Description=Display Manager -After=syslog.target local.service systemd-user-sessions.service +After=local.service systemd-user-sessions.service [Service] EnvironmentFile=/etc/sysconfig/desktop diff --git a/units/mandriva/prefdm.service b/units/mandriva/prefdm.service index d0c7f99c6e..4a896bf582 100644 --- a/units/mandriva/prefdm.service +++ b/units/mandriva/prefdm.service @@ -7,7 +7,7 @@ [Unit] Description=Display Manager -After=syslog.target livesys-late.service rc-local.service systemd-user-sessions.service +After=livesys-late.service rc-local.service systemd-user-sessions.service After=network.target acpid.service fs.service haldaemon.service # Do not stop plymouth, it is done in prefdm if required -- cgit v1.2.3-54-g00ecf From 5430f7f2bc7330f3088b894166bf3524a067e3d8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 12 Apr 2012 00:20:58 +0200 Subject: relicense to LGPLv2.1 (with exceptions) We finally got the OK from all contributors with non-trivial commits to relicense systemd from GPL2+ to LGPL2.1+. Some udev bits continue to be GPL2+ for now, but we are looking into relicensing them too, to allow free copy/paste of all code within systemd. The bits that used to be MIT continue to be MIT. The big benefit of the relicensing is that closed source code may now link against libsystemd-login.so and friends. --- LICENSE | 339 --------------- LICENSE.GPL2 | 339 +++++++++++++++ LICENSE.LGPL2.1 | 508 +++++++++++++++++++++++ LICENSE.MIT | 19 + Makefile.am | 12 +- README | 10 +- autogen.sh | 8 +- configure.ac | 8 +- man/binfmt.d.xml | 8 +- man/custom-html.xsl | 8 +- man/daemon.xml | 8 +- man/halt.xml | 8 +- man/hostname.xml | 8 +- man/journalctl.xml | 8 +- man/journald.conf.xml | 8 +- man/locale.conf.xml | 8 +- man/loginctl.xml | 8 +- man/logind.conf.xml | 8 +- man/machine-id.xml | 8 +- man/machine-info.xml | 8 +- man/modules-load.d.xml | 8 +- man/os-release.xml | 8 +- man/pam_systemd.xml | 8 +- man/runlevel.xml | 8 +- man/sd-daemon.xml | 8 +- man/sd-login.xml | 8 +- man/sd-readahead.xml | 8 +- man/sd_booted.xml | 8 +- man/sd_get_seats.xml | 8 +- man/sd_is_fifo.xml | 8 +- man/sd_listen_fds.xml | 8 +- man/sd_login_monitor_new.xml | 8 +- man/sd_notify.xml | 8 +- man/sd_pid_get_session.xml | 8 +- man/sd_readahead.xml | 8 +- man/sd_seat_get_active.xml | 8 +- man/sd_session_is_active.xml | 8 +- man/sd_uid_get_state.xml | 8 +- man/shutdown.xml | 8 +- man/sysctl.d.xml | 8 +- man/systemctl.xml | 8 +- man/systemd-ask-password.xml | 8 +- man/systemd-cat.xml | 8 +- man/systemd-cgls.xml | 8 +- man/systemd-cgtop.xml | 8 +- man/systemd-machine-id-setup.xml | 8 +- man/systemd-notify.xml | 8 +- man/systemd-nspawn.xml | 8 +- man/systemd-tmpfiles.xml | 8 +- man/systemd.automount.xml | 8 +- man/systemd.conf.xml | 8 +- man/systemd.device.xml | 8 +- man/systemd.exec.xml | 8 +- man/systemd.journal-fields.xml | 8 +- man/systemd.mount.xml | 8 +- man/systemd.path.xml | 8 +- man/systemd.service.xml | 8 +- man/systemd.snapshot.xml | 8 +- man/systemd.socket.xml | 8 +- man/systemd.special.xml | 8 +- man/systemd.swap.xml | 8 +- man/systemd.target.xml | 8 +- man/systemd.timer.xml | 8 +- man/systemd.unit.xml | 8 +- man/systemd.xml | 8 +- man/telinit.xml | 8 +- man/timezone.xml | 8 +- man/tmpfiles.d.xml | 8 +- man/vconsole.conf.xml | 8 +- rules/99-systemd.rules.in | 4 +- src/Makefile | 8 +- src/ac-power.c | 8 +- src/ask-password-api.c | 8 +- src/ask-password.c | 8 +- src/binfmt/binfmt.c | 8 +- src/bridge.c | 8 +- src/cgls.c | 8 +- src/cgroup-show.c | 8 +- src/cgroup-show.h | 8 +- src/cgroups-agent.c | 8 +- src/cgtop.c | 8 +- src/core/ask-password-api.h | 8 +- src/core/automount.c | 8 +- src/core/automount.h | 8 +- src/core/build.h | 8 +- src/core/bus-errors.h | 8 +- src/core/cgroup-attr.c | 8 +- src/core/cgroup-attr.h | 8 +- src/core/cgroup.c | 8 +- src/core/cgroup.h | 8 +- src/core/condition.c | 8 +- src/core/condition.h | 8 +- src/core/dbus-automount.c | 8 +- src/core/dbus-automount.h | 8 +- src/core/dbus-device.c | 8 +- src/core/dbus-device.h | 8 +- src/core/dbus-execute.c | 8 +- src/core/dbus-execute.h | 8 +- src/core/dbus-job.c | 8 +- src/core/dbus-job.h | 8 +- src/core/dbus-loop.h | 8 +- src/core/dbus-manager.c | 8 +- src/core/dbus-manager.h | 8 +- src/core/dbus-mount.c | 8 +- src/core/dbus-mount.h | 8 +- src/core/dbus-path.c | 8 +- src/core/dbus-path.h | 8 +- src/core/dbus-service.c | 8 +- src/core/dbus-service.h | 8 +- src/core/dbus-snapshot.c | 8 +- src/core/dbus-snapshot.h | 8 +- src/core/dbus-socket.c | 8 +- src/core/dbus-socket.h | 8 +- src/core/dbus-swap.c | 8 +- src/core/dbus-swap.h | 8 +- src/core/dbus-target.c | 8 +- src/core/dbus-target.h | 8 +- src/core/dbus-timer.c | 8 +- src/core/dbus-timer.h | 8 +- src/core/dbus-unit.c | 8 +- src/core/dbus-unit.h | 8 +- src/core/dbus.c | 8 +- src/core/dbus.h | 8 +- src/core/device.c | 8 +- src/core/device.h | 8 +- src/core/execute.c | 8 +- src/core/execute.h | 8 +- src/core/fdset.c | 8 +- src/core/fdset.h | 8 +- src/core/ima-setup.c | 8 +- src/core/ima-setup.h | 8 +- src/core/job.c | 8 +- src/core/job.h | 8 +- src/core/kmod-setup.c | 8 +- src/core/kmod-setup.h | 8 +- src/core/load-dropin.c | 8 +- src/core/load-dropin.h | 8 +- src/core/load-fragment.c | 8 +- src/core/load-fragment.h | 8 +- src/core/locale-setup.c | 8 +- src/core/locale-setup.h | 8 +- src/core/manager.c | 8 +- src/core/manager.h | 8 +- src/core/mount.c | 8 +- src/core/mount.h | 8 +- src/core/namespace.c | 8 +- src/core/namespace.h | 8 +- src/core/path.c | 8 +- src/core/path.h | 8 +- src/core/polkit.h | 8 +- src/core/selinux-setup.c | 8 +- src/core/selinux-setup.h | 8 +- src/core/service.c | 8 +- src/core/service.h | 8 +- src/core/snapshot.c | 8 +- src/core/snapshot.h | 8 +- src/core/socket.c | 8 +- src/core/socket.h | 8 +- src/core/special.h | 8 +- src/core/swap.c | 8 +- src/core/swap.h | 8 +- src/core/sysfs-show.h | 8 +- src/core/target.c | 8 +- src/core/target.h | 8 +- src/core/tcpwrap.c | 8 +- src/core/tcpwrap.h | 8 +- src/core/timer.c | 8 +- src/core/timer.h | 8 +- src/core/unit.c | 8 +- src/core/unit.h | 8 +- src/cryptsetup/cryptsetup-generator.c | 8 +- src/cryptsetup/cryptsetup.c | 8 +- src/dbus-common.c | 8 +- src/dbus-common.h | 8 +- src/dbus-loop.c | 8 +- src/def.h | 8 +- src/detect-virt.c | 8 +- src/fsck.c | 8 +- src/getty-generator.c | 8 +- src/hostname-setup.c | 8 +- src/hostname-setup.h | 8 +- src/hostname/hostnamed.c | 8 +- src/hostname/org.freedesktop.hostname1.conf | 4 +- src/hostname/org.freedesktop.hostname1.policy.in | 4 +- src/hostname/org.freedesktop.hostname1.service | 4 +- src/initctl.c | 8 +- src/install.c | 8 +- src/install.h | 8 +- src/journal/cat.c | 8 +- src/journal/compress.c | 8 +- src/journal/compress.h | 8 +- src/journal/coredump.c | 8 +- src/journal/journal-def.h | 8 +- src/journal/journal-file.c | 8 +- src/journal/journal-file.h | 8 +- src/journal/journal-internal.h | 8 +- src/journal/journal-rate-limit.c | 8 +- src/journal/journal-rate-limit.h | 8 +- src/journal/journal-send.c | 8 +- src/journal/journalctl.c | 8 +- src/journal/journald.c | 8 +- src/journal/journald.conf | 4 +- src/journal/journald.h | 8 +- src/journal/libsystemd-journal.pc.in | 4 +- src/journal/libsystemd-journal.sym | 4 +- src/journal/sd-journal.c | 8 +- src/journal/test-journal-send.c | 8 +- src/journal/test-journal.c | 8 +- src/libsystemd-id128.pc.in | 4 +- src/libsystemd-id128.sym | 4 +- src/locale/localed.c | 8 +- src/locale/org.freedesktop.locale1.conf | 4 +- src/locale/org.freedesktop.locale1.policy.in | 4 +- src/locale/org.freedesktop.locale1.service | 4 +- src/login/70-uaccess.rules | 4 +- src/login/71-seat.rules | 4 +- src/login/73-seat-late.rules.in | 4 +- src/login/libsystemd-login.pc.in | 4 +- src/login/libsystemd-login.sym | 4 +- src/login/loginctl.c | 8 +- src/login/logind-acl.c | 8 +- src/login/logind-acl.h | 8 +- src/login/logind-dbus.c | 8 +- src/login/logind-device.c | 8 +- src/login/logind-device.h | 8 +- src/login/logind-seat-dbus.c | 8 +- src/login/logind-seat.c | 8 +- src/login/logind-seat.h | 8 +- src/login/logind-session-dbus.c | 8 +- src/login/logind-session.c | 8 +- src/login/logind-session.h | 8 +- src/login/logind-user-dbus.c | 8 +- src/login/logind-user.c | 8 +- src/login/logind-user.h | 8 +- src/login/logind.c | 8 +- src/login/logind.conf | 4 +- src/login/logind.h | 8 +- src/login/multi-seat-x.c | 8 +- src/login/org.freedesktop.login1.conf | 4 +- src/login/org.freedesktop.login1.policy.in | 4 +- src/login/org.freedesktop.login1.service | 4 +- src/login/pam-module.c | 8 +- src/login/sd-login.c | 8 +- src/login/sysfs-show.c | 8 +- src/login/test-login.c | 8 +- src/login/uaccess.c | 8 +- src/login/user-sessions.c | 8 +- src/logs-show.c | 8 +- src/logs-show.h | 8 +- src/loopback-setup.c | 8 +- src/loopback-setup.h | 8 +- src/machine-id-main.c | 8 +- src/machine-id-setup.c | 8 +- src/machine-id-setup.h | 8 +- src/main.c | 8 +- src/missing.h | 8 +- src/modules-load.c | 8 +- src/mount-setup.c | 8 +- src/mount-setup.h | 8 +- src/notify.c | 8 +- src/nspawn.c | 8 +- src/org.freedesktop.systemd1.conf | 4 +- src/org.freedesktop.systemd1.policy.in.in | 4 +- src/org.freedesktop.systemd1.service | 4 +- src/path-lookup.c | 8 +- src/path-lookup.h | 8 +- src/polkit.c | 8 +- src/quotacheck.c | 8 +- src/random-seed.c | 8 +- src/rc-local-generator.c | 8 +- src/readahead/readahead-collect.c | 8 +- src/readahead/readahead-common.c | 8 +- src/readahead/readahead-common.h | 8 +- src/readahead/readahead-replay.c | 8 +- src/remount-api-vfs.c | 8 +- src/reply-password.c | 8 +- src/sd-id128.c | 8 +- src/shared/acl-util.c | 8 +- src/shared/acl-util.h | 8 +- src/shared/audit.c | 8 +- src/shared/audit.h | 8 +- src/shared/capability.c | 8 +- src/shared/capability.h | 8 +- src/shared/cgroup-label.c | 8 +- src/shared/cgroup-util.c | 8 +- src/shared/cgroup-util.h | 8 +- src/shared/conf-parser.c | 8 +- src/shared/conf-parser.h | 8 +- src/shared/exit-status.c | 8 +- src/shared/exit-status.h | 8 +- src/shared/hashmap.c | 8 +- src/shared/hashmap.h | 8 +- src/shared/label.c | 8 +- src/shared/label.h | 8 +- src/shared/list.h | 8 +- src/shared/log.c | 8 +- src/shared/log.h | 8 +- src/shared/macro.h | 8 +- src/shared/mkdir.c | 8 +- src/shared/mkdir.h | 8 +- src/shared/pager.c | 8 +- src/shared/pager.h | 8 +- src/shared/ratelimit.c | 8 +- src/shared/ratelimit.h | 8 +- src/shared/set.c | 8 +- src/shared/set.h | 8 +- src/shared/socket-label.c | 8 +- src/shared/socket-util.c | 8 +- src/shared/socket-util.h | 8 +- src/shared/strv.c | 8 +- src/shared/strv.h | 8 +- src/shared/utf8.c | 8 +- src/shared/utf8.h | 8 +- src/shared/util.c | 8 +- src/shared/util.h | 8 +- src/shared/virt.c | 8 +- src/shared/virt.h | 8 +- src/shutdown.c | 8 +- src/shutdownd.c | 8 +- src/spawn-ask-password-agent.c | 8 +- src/spawn-ask-password-agent.h | 8 +- src/spawn-polkit-agent.c | 8 +- src/spawn-polkit-agent.h | 8 +- src/specifier.c | 8 +- src/specifier.h | 8 +- src/sysctl.c | 8 +- src/system.conf | 4 +- src/systemctl.c | 8 +- src/systemd-bash-completion.sh | 6 +- src/systemd.pc.in | 4 +- src/systemd/sd-id128.h | 8 +- src/systemd/sd-journal.h | 8 +- src/systemd/sd-login.h | 8 +- src/systemd/sd-messages.h | 8 +- src/systemd/sd-shutdown.h | 8 +- src/test-cgroup.c | 8 +- src/test-daemon.c | 8 +- src/test-engine.c | 8 +- src/test-env-replace.c | 8 +- src/test-hostname.c | 8 +- src/test-id128.c | 8 +- src/test-install.c | 8 +- src/test-job-type.c | 8 +- src/test-loopback.c | 8 +- src/test-ns.c | 8 +- src/test-strv.c | 8 +- src/test-watchdog.c | 8 +- src/timedate/org.freedesktop.timedate1.conf | 4 +- src/timedate/org.freedesktop.timedate1.policy.in | 4 +- src/timedate/org.freedesktop.timedate1.service | 4 +- src/timedate/timedated.c | 8 +- src/timestamp.c | 8 +- src/tmpfiles.c | 8 +- src/tty-ask-password-agent.c | 8 +- src/umount.c | 8 +- src/umount.h | 8 +- src/unit-name.c | 8 +- src/unit-name.h | 8 +- src/update-utmp.c | 8 +- src/user.conf | 4 +- src/utmp-wtmp.c | 8 +- src/utmp-wtmp.h | 8 +- src/vconsole/vconsole-setup.c | 8 +- src/watchdog.c | 8 +- src/watchdog.h | 8 +- sysctl.d/coredump.conf.in | 4 +- tmpfiles.d/legacy.conf | 4 +- tmpfiles.d/systemd.conf | 4 +- tmpfiles.d/tmp.conf | 4 +- tmpfiles.d/x11.conf | 4 +- units/basic.target | 4 +- units/bluetooth.target | 4 +- units/console-shell.service.m4.in | 4 +- units/cryptsetup.target | 4 +- units/dev-hugepages.mount | 4 +- units/dev-mqueue.mount | 4 +- units/emergency.service.in | 4 +- units/emergency.target | 4 +- units/fedora/halt-local.service | 4 +- units/fedora/prefdm.service | 4 +- units/fedora/rc-local.service | 4 +- units/final.target | 4 +- units/frugalware/display-manager.service | 4 +- units/fsck-root.service.in | 4 +- units/fsck@.service.in | 4 +- units/getty.target | 4 +- units/getty@.service.m4 | 4 +- units/graphical.target | 4 +- units/halt.service.in | 4 +- units/halt.target | 4 +- units/http-daemon.target | 4 +- units/kexec.service.in | 4 +- units/kexec.target | 4 +- units/local-fs-pre.target | 4 +- units/local-fs.target | 4 +- units/mageia/prefdm.service | 4 +- units/mail-transfer-agent.target | 4 +- units/mandriva/prefdm.service | 4 +- units/multi-user.target | 4 +- units/network.target | 4 +- units/nss-lookup.target | 4 +- units/nss-user-lookup.target | 4 +- units/plymouth-halt.service | 4 +- units/plymouth-kexec.service | 4 +- units/plymouth-poweroff.service | 4 +- units/plymouth-quit-wait.service | 4 +- units/plymouth-quit.service | 4 +- units/plymouth-read-write.service | 4 +- units/plymouth-reboot.service | 4 +- units/plymouth-start.service | 4 +- units/poweroff.service.in | 4 +- units/poweroff.target | 4 +- units/printer.target | 4 +- units/proc-sys-fs-binfmt_misc.automount | 4 +- units/proc-sys-fs-binfmt_misc.mount | 4 +- units/quotacheck.service.in | 4 +- units/quotaon.service | 4 +- units/reboot.service.in | 4 +- units/reboot.target | 4 +- units/remote-fs-pre.target | 4 +- units/remote-fs.target | 4 +- units/remount-rootfs.service | 4 +- units/rescue.service.m4.in | 4 +- units/rescue.target | 4 +- units/rpcbind.target | 4 +- units/serial-getty@.service.m4 | 4 +- units/shutdown.target | 4 +- units/sigpwr.target | 4 +- units/smartcard.target | 4 +- units/sockets.target | 4 +- units/sound.target | 4 +- units/suse/halt-local.service | 4 +- units/suse/rc-local.service | 4 +- units/swap.target | 4 +- units/sys-fs-fuse-connections.mount | 4 +- units/sys-kernel-config.mount | 4 +- units/sys-kernel-debug.mount | 4 +- units/sysinit.target | 4 +- units/syslog.socket | 4 +- units/syslog.target | 4 +- units/systemd-ask-password-console.path | 4 +- units/systemd-ask-password-console.service.in | 4 +- units/systemd-ask-password-plymouth.path | 4 +- units/systemd-ask-password-plymouth.service.in | 4 +- units/systemd-ask-password-wall.path | 4 +- units/systemd-ask-password-wall.service.in | 4 +- units/systemd-binfmt.service.in | 4 +- units/systemd-hostnamed.service.in | 4 +- units/systemd-initctl.service.in | 4 +- units/systemd-initctl.socket | 4 +- units/systemd-journald.service.in | 4 +- units/systemd-journald.socket | 4 +- units/systemd-localed.service.in | 4 +- units/systemd-logind.service.in | 4 +- units/systemd-modules-load.service.in | 4 +- units/systemd-random-seed-load.service.in | 4 +- units/systemd-random-seed-save.service.in | 4 +- units/systemd-readahead-collect.service.in | 4 +- units/systemd-readahead-done.service.in | 4 +- units/systemd-readahead-done.timer | 4 +- units/systemd-readahead-replay.service.in | 4 +- units/systemd-remount-api-vfs.service.in | 4 +- units/systemd-shutdownd.service.in | 4 +- units/systemd-shutdownd.socket | 4 +- units/systemd-sysctl.service.in | 4 +- units/systemd-timedated.service.in | 4 +- units/systemd-tmpfiles-clean.service.in | 4 +- units/systemd-tmpfiles-clean.timer | 4 +- units/systemd-tmpfiles-setup.service.in | 4 +- units/systemd-update-utmp-runlevel.service.in | 4 +- units/systemd-update-utmp-shutdown.service.in | 4 +- units/systemd-user-sessions.service.in | 4 +- units/systemd-vconsole-setup.service.in | 4 +- units/time-sync.target | 4 +- units/tmp.mount | 4 +- units/umount.target | 4 +- units/user/default.target | 4 +- units/user/exit.service.in | 4 +- units/user/exit.target | 4 +- units/user@.service.in | 4 +- 480 files changed, 2485 insertions(+), 1952 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE.GPL2 create mode 100644 LICENSE.LGPL2.1 create mode 100644 LICENSE.MIT (limited to 'man/daemon.xml') diff --git a/LICENSE b/LICENSE deleted file mode 100644 index d511905c16..0000000000 --- a/LICENSE +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program 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 - (at your option) any later version. - - This program 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. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/LICENSE.GPL2 b/LICENSE.GPL2 new file mode 100644 index 0000000000..d511905c16 --- /dev/null +++ b/LICENSE.GPL2 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program 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 + (at your option) any later version. + + This program 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. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/LICENSE.LGPL2.1 b/LICENSE.LGPL2.1 new file mode 100644 index 0000000000..89d4489cec --- /dev/null +++ b/LICENSE.LGPL2.1 @@ -0,0 +1,508 @@ + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations +below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. +^L + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it +becomes a de-facto standard. To achieve this, non-free programs must +be allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. +^L + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control +compilation and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. +^L + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. +^L + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at least + three years, to give the same user the materials specified in + Subsection 6a, above, for a charge no more than the cost of + performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. +^L + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. +^L + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply, and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License +may add an explicit geographical distribution limitation excluding those +countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. +^L + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS +^L + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms +of the ordinary General Public License). + + To apply these terms, attach the following notices to the library. +It is safest to attach them to the start of each source file to most +effectively convey the exclusion of warranty; and each file should +have at least the "copyright" line and a pointer to where the full +notice is found. + + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it 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. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or +your school, if any, to sign a "copyright disclaimer" for the library, +if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James + Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/LICENSE.MIT b/LICENSE.MIT new file mode 100644 index 0000000000..fd44f736ee --- /dev/null +++ b/LICENSE.MIT @@ -0,0 +1,19 @@ +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation files +(the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/Makefile.am b/Makefile.am index 675e591352..0a9f2e5198 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,16 +4,16 @@ # Copyright 2010-2012 Kay Sievers # # 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 . ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} @@ -457,7 +457,9 @@ endif dist_doc_DATA = \ README \ NEWS \ - LICENSE \ + LICENSE.LGPL2.1 \ + LICENSE.GPL2 \ + LICENSE.MIT \ DISTRO_PORTING pkgconfigdata_DATA = \ diff --git a/README b/README index 6b0eb51ecd..2467b1e03e 100644 --- a/README +++ b/README @@ -24,11 +24,15 @@ BUG REPORTS: https://bugs.freedesktop.org/enter_bug.cgi?product=systemd AUTHOR: - Lennart Poettering with major support from Kay Sievers + Lennart Poettering + Kay Sievers + ...and many others LICENSE: - GPLv2+ for all code, except sd-daemon.[ch] and - sd-readahead.[ch] which are MIT + LGPLv2.1+ for all code + - except sd-daemon.[ch] and sd-readahead.[ch] which are MIT + - except src/udev/ which is GPLv2.0+, excluding + src/udev/libudev* which is LGPLv2.1+ REQUIREMENTS: Linux kernel >= 2.6.39 diff --git a/autogen.sh b/autogen.sh index fba3dc08b8..0e1b5bedf6 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,16 +3,16 @@ # This file is part of systemd. # # 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 . if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then diff --git a/configure.ac b/configure.ac index 52374c15dd..93523d53d9 100644 --- a/configure.ac +++ b/configure.ac @@ -4,16 +4,16 @@ # Copyright 2010-2012 Kay Sievers # # 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 . AC_PREREQ(2.63) diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml index f5ec805e29..e997bcf21c 100644 --- a/man/binfmt.d.xml +++ b/man/binfmt.d.xml @@ -7,16 +7,16 @@ Copyright 2011 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 . --> diff --git a/man/custom-html.xsl b/man/custom-html.xsl index 2d2f458793..df16d08718 100644 --- a/man/custom-html.xsl +++ b/man/custom-html.xsl @@ -6,16 +6,16 @@ Copyright 2011 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 . --> diff --git a/man/daemon.xml b/man/daemon.xml index 997ee5b253..a7217c84aa 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 . --> diff --git a/man/halt.xml b/man/halt.xml index 97a53ba350..7ba85ed88d 100644 --- a/man/halt.xml +++ b/man/halt.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 . --> diff --git a/man/hostname.xml b/man/hostname.xml index 1acda1af5d..2ada32ff71 100644 --- a/man/hostname.xml +++ b/man/hostname.xml @@ -9,16 +9,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 . --> diff --git a/man/journalctl.xml b/man/journalctl.xml index 4728d36e1c..5e0c6dd5c1 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -8,16 +8,16 @@ Copyright 2012 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 . --> diff --git a/man/journald.conf.xml b/man/journald.conf.xml index eb596eb3ab..251e01dddf 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -9,16 +9,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 . --> diff --git a/man/locale.conf.xml b/man/locale.conf.xml index 37239974b6..0c4d351ec7 100644 --- a/man/locale.conf.xml +++ b/man/locale.conf.xml @@ -9,16 +9,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 . --> diff --git a/man/loginctl.xml b/man/loginctl.xml index cf0be0d19b..8e34a29801 100644 --- a/man/loginctl.xml +++ b/man/loginctl.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 . --> diff --git a/man/logind.conf.xml b/man/logind.conf.xml index 950f81fa93..6a10fa9868 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -9,16 +9,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 . --> diff --git a/man/machine-id.xml b/man/machine-id.xml index 97c622c6fa..73f0926c0b 100644 --- a/man/machine-id.xml +++ b/man/machine-id.xml @@ -9,16 +9,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 . --> diff --git a/man/machine-info.xml b/man/machine-info.xml index 240da25a6b..e27b600211 100644 --- a/man/machine-info.xml +++ b/man/machine-info.xml @@ -9,16 +9,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 . --> diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml index e2f7d5c68c..91d230c35a 100644 --- a/man/modules-load.d.xml +++ b/man/modules-load.d.xml @@ -7,16 +7,16 @@ Copyright 2011 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 . --> diff --git a/man/os-release.xml b/man/os-release.xml index ff8fdf16be..a5f1a917a8 100644 --- a/man/os-release.xml +++ b/man/os-release.xml @@ -9,16 +9,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 . --> diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml index c07b46bab2..d681276c40 100644 --- a/man/pam_systemd.xml +++ b/man/pam_systemd.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 . --> diff --git a/man/runlevel.xml b/man/runlevel.xml index 160d1b14e7..02d5371c5d 100644 --- a/man/runlevel.xml +++ b/man/runlevel.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 . --> diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml index 4ea88e43d7..31115a5d69 100644 --- a/man/sd-daemon.xml +++ b/man/sd-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 . --> diff --git a/man/sd-login.xml b/man/sd-login.xml index 3fc0e16f69..acb78ac689 100644 --- a/man/sd-login.xml +++ b/man/sd-login.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 . --> diff --git a/man/sd-readahead.xml b/man/sd-readahead.xml index 7fb8634120..4eed56ad32 100644 --- a/man/sd-readahead.xml +++ b/man/sd-readahead.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 . --> diff --git a/man/sd_booted.xml b/man/sd_booted.xml index 141625d9ad..62d6e57415 100644 --- a/man/sd_booted.xml +++ b/man/sd_booted.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 . --> diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml index 2ac76500ec..d30d193a59 100644 --- a/man/sd_get_seats.xml +++ b/man/sd_get_seats.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 . --> diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml index 4db512012c..289e1ba138 100644 --- a/man/sd_is_fifo.xml +++ b/man/sd_is_fifo.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 . --> diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml index c3c70a0df0..e76630e4ff 100644 --- a/man/sd_listen_fds.xml +++ b/man/sd_listen_fds.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 . --> diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml index de484329a9..4642e99f74 100644 --- a/man/sd_login_monitor_new.xml +++ b/man/sd_login_monitor_new.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 . --> diff --git a/man/sd_notify.xml b/man/sd_notify.xml index 9d9ea4132f..eb449555cb 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.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 . --> diff --git a/man/sd_pid_get_session.xml b/man/sd_pid_get_session.xml index 94f5330222..9a1b1997d9 100644 --- a/man/sd_pid_get_session.xml +++ b/man/sd_pid_get_session.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 . --> diff --git a/man/sd_readahead.xml b/man/sd_readahead.xml index 2e7e09c5ec..2a92727881 100644 --- a/man/sd_readahead.xml +++ b/man/sd_readahead.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 . --> diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml index acc6ee4ea7..997c388901 100644 --- a/man/sd_seat_get_active.xml +++ b/man/sd_seat_get_active.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 . --> diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml index afdeed55d6..45151aaaf9 100644 --- a/man/sd_session_is_active.xml +++ b/man/sd_session_is_active.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 . --> diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml index 9249021aa1..c5096e885b 100644 --- a/man/sd_uid_get_state.xml +++ b/man/sd_uid_get_state.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 . --> diff --git a/man/shutdown.xml b/man/shutdown.xml index c8c4b54620..d54fcb25ab 100644 --- a/man/shutdown.xml +++ b/man/shutdown.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 . --> diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml index 20f2e24820..4f30276ad4 100644 --- a/man/sysctl.d.xml +++ b/man/sysctl.d.xml @@ -7,16 +7,16 @@ Copyright 2011 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 . --> diff --git a/man/systemctl.xml b/man/systemctl.xml index 84f1b1cd60..dd0ff786ec 100644 --- a/man/systemctl.xml +++ b/man/systemctl.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 . --> diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml index c607b1a367..f09b38cd8d 100644 --- a/man/systemd-ask-password.xml +++ b/man/systemd-ask-password.xml @@ -8,16 +8,16 @@ Copyright 2011 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 . --> diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml index 350a345d43..8acf9b7781 100644 --- a/man/systemd-cat.xml +++ b/man/systemd-cat.xml @@ -8,16 +8,16 @@ Copyright 2012 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 . --> diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml index 1e53147e1b..fb9f06b307 100644 --- a/man/systemd-cgls.xml +++ b/man/systemd-cgls.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 . --> diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml index 2d67ae5ef4..9322fb0920 100644 --- a/man/systemd-cgtop.xml +++ b/man/systemd-cgtop.xml @@ -8,16 +8,16 @@ Copyright 2012 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 . --> diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml index 49b92f6891..b6b236ac7e 100644 --- a/man/systemd-machine-id-setup.xml +++ b/man/systemd-machine-id-setup.xml @@ -8,16 +8,16 @@ Copyright 2012 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 . --> diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml index c5ffafe895..073bc1313e 100644 --- a/man/systemd-notify.xml +++ b/man/systemd-notify.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 . --> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index dbd2ff5a8a..2a26b1ef18 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.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 . --> diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml index bbb80b2f98..f58913d0c2 100644 --- a/man/systemd-tmpfiles.xml +++ b/man/systemd-tmpfiles.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 . --> diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml index 754d1e37f3..bf4b5d8214 100644 --- a/man/systemd.automount.xml +++ b/man/systemd.automount.xml @@ -9,16 +9,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 . --> diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml index c7890287b5..d05a30bd48 100644 --- a/man/systemd.conf.xml +++ b/man/systemd.conf.xml @@ -9,16 +9,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 . --> diff --git a/man/systemd.device.xml b/man/systemd.device.xml index 63863bebdf..78cddd6518 100644 --- a/man/systemd.device.xml +++ b/man/systemd.device.xml @@ -9,16 +9,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 . --> diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index e6f49c9fd0..219733be37 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -9,16 +9,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 . --> diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml index e638893b63..99b1caab9b 100644 --- a/man/systemd.journal-fields.xml +++ b/man/systemd.journal-fields.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 . --> diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index 8f1cc514cf..2352b6a8fe 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -9,16 +9,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 . --> diff --git a/man/systemd.path.xml b/man/systemd.path.xml index 5b1ff75f7a..01082ad61d 100644 --- a/man/systemd.path.xml +++ b/man/systemd.path.xml @@ -9,16 +9,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 . --> diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 837a992ba4..258b059efa 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -9,16 +9,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 . --> diff --git a/man/systemd.snapshot.xml b/man/systemd.snapshot.xml index a3e23225c6..db3343af67 100644 --- a/man/systemd.snapshot.xml +++ b/man/systemd.snapshot.xml @@ -9,16 +9,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 . --> diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index d9921e496d..d3762cd63d 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -9,16 +9,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 . --> diff --git a/man/systemd.special.xml b/man/systemd.special.xml index 4c64a0fef2..39c3802210 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.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 . --> diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index ab00f9f318..30a15ecfc3 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -9,16 +9,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 . --> diff --git a/man/systemd.target.xml b/man/systemd.target.xml index 6b1dbfbde3..61eeb7fd8a 100644 --- a/man/systemd.target.xml +++ b/man/systemd.target.xml @@ -9,16 +9,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 . --> diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml index 9b6b486bf4..0b204353f4 100644 --- a/man/systemd.timer.xml +++ b/man/systemd.timer.xml @@ -9,16 +9,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 . --> diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 3cc126b12a..3fc7f78198 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.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 . --> diff --git a/man/systemd.xml b/man/systemd.xml index aef65e30c1..d179273caa 100644 --- a/man/systemd.xml +++ b/man/systemd.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 . --> diff --git a/man/telinit.xml b/man/telinit.xml index fec059aa66..4c6064f54a 100644 --- a/man/telinit.xml +++ b/man/telinit.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 . --> diff --git a/man/timezone.xml b/man/timezone.xml index 4e33279158..dedb7d90ff 100644 --- a/man/timezone.xml +++ b/man/timezone.xml @@ -9,16 +9,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 . --> diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml index f70bf0ef9f..5d4b2ac6d4 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -7,16 +7,16 @@ Copyright 2010 Brandon Philips 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 . --> diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml index a73db00d1c..72f1530620 100644 --- a/man/vconsole.conf.xml +++ b/man/vconsole.conf.xml @@ -9,16 +9,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 . --> diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in index d306f71b63..1d53735c82 100644 --- a/rules/99-systemd.rules.in +++ b/rules/99-systemd.rules.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. ACTION=="remove", GOTO="systemd_end" diff --git a/src/Makefile b/src/Makefile index bc7e9fa363..9d07505194 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,16 +3,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 . # This file is a dirty trick to simplify compilation from within diff --git a/src/ac-power.c b/src/ac-power.c index 24a68e717e..37313cf144 100644 --- a/src/ac-power.c +++ b/src/ac-power.c @@ -6,16 +6,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 . ***/ diff --git a/src/ask-password-api.c b/src/ask-password-api.c index 4b50d28d30..55be807cf2 100644 --- a/src/ask-password-api.c +++ b/src/ask-password-api.c @@ -6,16 +6,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 . ***/ #include diff --git a/src/ask-password.c b/src/ask-password.c index 5162f62eee..5f675700f8 100644 --- a/src/ask-password.c +++ b/src/ask-password.c @@ -6,16 +6,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 . ***/ diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c index 3c8d815d64..5bd763339e 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c @@ -6,16 +6,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 . ***/ diff --git a/src/bridge.c b/src/bridge.c index bfb38a8bb4..f926fe5538 100644 --- a/src/bridge.c +++ b/src/bridge.c @@ -6,16 +6,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 . ***/ diff --git a/src/cgls.c b/src/cgls.c index d5417f9505..fd02d52c23 100644 --- a/src/cgls.c +++ b/src/cgls.c @@ -6,16 +6,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 . ***/ diff --git a/src/cgroup-show.c b/src/cgroup-show.c index ee2a241c9f..550a2f5f31 100644 --- a/src/cgroup-show.c +++ b/src/cgroup-show.c @@ -6,16 +6,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 . ***/ diff --git a/src/cgroup-show.h b/src/cgroup-show.h index 992e17b986..5433f46a53 100644 --- a/src/cgroup-show.h +++ b/src/cgroup-show.h @@ -9,16 +9,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 . ***/ diff --git a/src/cgroups-agent.c b/src/cgroups-agent.c index 1bbc8827d7..7a6173e2a2 100644 --- a/src/cgroups-agent.c +++ b/src/cgroups-agent.c @@ -6,16 +6,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 . ***/ diff --git a/src/cgtop.c b/src/cgtop.c index 8b8617dc1c..1fe247c667 100644 --- a/src/cgtop.c +++ b/src/cgtop.c @@ -6,16 +6,16 @@ Copyright 2012 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 . ***/ diff --git a/src/core/ask-password-api.h b/src/core/ask-password-api.h index fec8625a0f..155afad33b 100644 --- a/src/core/ask-password-api.h +++ b/src/core/ask-password-api.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/automount.c b/src/core/automount.c index 6857a6fd76..11c217beb9 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/automount.h b/src/core/automount.h index 19baee208b..5704502ef7 100644 --- a/src/core/automount.h +++ b/src/core/automount.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/build.h b/src/core/build.h index 0619013141..4ccfab1361 100644 --- a/src/core/build.h +++ b/src/core/build.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/bus-errors.h b/src/core/bus-errors.h index 82d4e99eef..a6f055f099 100644 --- a/src/core/bus-errors.h +++ b/src/core/bus-errors.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/cgroup-attr.c b/src/core/cgroup-attr.c index 474a6865c4..71af09cf87 100644 --- a/src/core/cgroup-attr.c +++ b/src/core/cgroup-attr.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/core/cgroup-attr.h b/src/core/cgroup-attr.h index 63a73b8101..2b3c1aea9e 100644 --- a/src/core/cgroup-attr.h +++ b/src/core/cgroup-attr.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 1f6139e25f..ef9b02f463 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/cgroup.h b/src/core/cgroup.h index 5faa7dc0f7..de248fbca3 100644 --- a/src/core/cgroup.h +++ b/src/core/cgroup.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/condition.c b/src/core/condition.c index 2b51a16f17..5dad5248bb 100644 --- a/src/core/condition.c +++ b/src/core/condition.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/condition.h b/src/core/condition.h index 71b1c6761e..2a44ba681f 100644 --- a/src/core/condition.h +++ b/src/core/condition.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/dbus-automount.c b/src/core/dbus-automount.c index 8e45f81fcf..b93e3ea35f 100644 --- a/src/core/dbus-automount.c +++ b/src/core/dbus-automount.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/dbus-automount.h b/src/core/dbus-automount.h index 2fc8345048..6849244b43 100644 --- a/src/core/dbus-automount.h +++ b/src/core/dbus-automount.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/dbus-device.c b/src/core/dbus-device.c index b39fb9d381..dfbbafb66d 100644 --- a/src/core/dbus-device.c +++ b/src/core/dbus-device.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/dbus-device.h b/src/core/dbus-device.h index fba270b4e6..068adee5b8 100644 --- a/src/core/dbus-device.h +++ b/src/core/dbus-device.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 1fd2b21336..ef55ef12b9 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/dbus-execute.h b/src/core/dbus-execute.h index 03cd69d126..b8bbe1c9f2 100644 --- a/src/core/dbus-execute.h +++ b/src/core/dbus-execute.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c index ab6d610243..1b86e96624 100644 --- a/src/core/dbus-job.c +++ b/src/core/dbus-job.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/dbus-job.h b/src/core/dbus-job.h index 103c2ff3ec..1ee0a42793 100644 --- a/src/core/dbus-job.h +++ b/src/core/dbus-job.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/dbus-loop.h b/src/core/dbus-loop.h index 0bbdfe5925..3902b354cf 100644 --- a/src/core/dbus-loop.h +++ b/src/core/dbus-loop.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 3bf0c07b88..46b47849d2 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/dbus-manager.h b/src/core/dbus-manager.h index 2eb2fbbed6..0563b324f3 100644 --- a/src/core/dbus-manager.h +++ b/src/core/dbus-manager.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/dbus-mount.c b/src/core/dbus-mount.c index 35d6ea7a1d..f6db4682af 100644 --- a/src/core/dbus-mount.c +++ b/src/core/dbus-mount.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/dbus-mount.h b/src/core/dbus-mount.h index b5613fa7b6..097421396e 100644 --- a/src/core/dbus-mount.h +++ b/src/core/dbus-mount.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/dbus-path.c b/src/core/dbus-path.c index 5506784c38..b77b5191c9 100644 --- a/src/core/dbus-path.c +++ b/src/core/dbus-path.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/dbus-path.h b/src/core/dbus-path.h index 2888400a13..db2d5b9161 100644 --- a/src/core/dbus-path.h +++ b/src/core/dbus-path.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c index d840415417..e0e5ffcbfd 100644 --- a/src/core/dbus-service.c +++ b/src/core/dbus-service.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/dbus-service.h b/src/core/dbus-service.h index d6eab65c52..27f65f5c98 100644 --- a/src/core/dbus-service.h +++ b/src/core/dbus-service.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/dbus-snapshot.c b/src/core/dbus-snapshot.c index e69388a524..7ff0bca2c8 100644 --- a/src/core/dbus-snapshot.c +++ b/src/core/dbus-snapshot.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/dbus-snapshot.h b/src/core/dbus-snapshot.h index 0b82279f1c..fea13872aa 100644 --- a/src/core/dbus-snapshot.h +++ b/src/core/dbus-snapshot.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c index 2e3342cb55..80d19dd1bd 100644 --- a/src/core/dbus-socket.c +++ b/src/core/dbus-socket.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/dbus-socket.h b/src/core/dbus-socket.h index 069a2f5df0..eafb3af6b8 100644 --- a/src/core/dbus-socket.h +++ b/src/core/dbus-socket.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/dbus-swap.c b/src/core/dbus-swap.c index 09cd1e8b9c..f327ca8b02 100644 --- a/src/core/dbus-swap.c +++ b/src/core/dbus-swap.c @@ -7,16 +7,16 @@ Copyright 2010 Maarten Lankhorst 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 . ***/ diff --git a/src/core/dbus-swap.h b/src/core/dbus-swap.h index 15b914726b..196756534b 100644 --- a/src/core/dbus-swap.h +++ b/src/core/dbus-swap.h @@ -10,16 +10,16 @@ Copyright 2010 Maarten Lankhorst 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 . ***/ diff --git a/src/core/dbus-target.c b/src/core/dbus-target.c index 55cf862de0..67ffff870f 100644 --- a/src/core/dbus-target.c +++ b/src/core/dbus-target.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/dbus-target.h b/src/core/dbus-target.h index 13d38764a2..f11cec7d21 100644 --- a/src/core/dbus-target.h +++ b/src/core/dbus-target.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c index b396aed047..c76c2e0500 100644 --- a/src/core/dbus-timer.c +++ b/src/core/dbus-timer.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/dbus-timer.h b/src/core/dbus-timer.h index e692e12fcb..daa26c8512 100644 --- a/src/core/dbus-timer.h +++ b/src/core/dbus-timer.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index c7532c7255..0484d75829 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/dbus-unit.h b/src/core/dbus-unit.h index 4f19a808bf..e6d549c0fb 100644 --- a/src/core/dbus-unit.h +++ b/src/core/dbus-unit.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/dbus.c b/src/core/dbus.c index ddf91f225a..fe73b0a434 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/dbus.h b/src/core/dbus.h index bd539d0e72..ed0b1c7cec 100644 --- a/src/core/dbus.h +++ b/src/core/dbus.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/device.c b/src/core/device.c index 0575379d80..88ce0cdd18 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/device.h b/src/core/device.h index a05c3d37b0..fa806575c9 100644 --- a/src/core/device.h +++ b/src/core/device.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/execute.c b/src/core/execute.c index 179ca7e55c..8ae3923c5d 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/execute.h b/src/core/execute.h index 0d7e7dd65d..fc4c71e534 100644 --- a/src/core/execute.h +++ b/src/core/execute.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/fdset.c b/src/core/fdset.c index e67fe6fabf..fe918cd8cc 100644 --- a/src/core/fdset.c +++ b/src/core/fdset.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/fdset.h b/src/core/fdset.h index 044a9e6d1f..bb58172430 100644 --- a/src/core/fdset.h +++ b/src/core/fdset.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c index 03e43dcf16..e8cc1ba8b6 100644 --- a/src/core/ima-setup.c +++ b/src/core/ima-setup.c @@ -8,16 +8,16 @@ TORSEC group -- http://security.polito.it 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 . ***/ diff --git a/src/core/ima-setup.h b/src/core/ima-setup.h index 7d677cf852..8de64bfdb1 100644 --- a/src/core/ima-setup.h +++ b/src/core/ima-setup.h @@ -11,16 +11,16 @@ TORSEC group -- http://security.polito.it 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 . ***/ diff --git a/src/core/job.c b/src/core/job.c index bae6ab9f32..781f83e175 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/job.h b/src/core/job.h index 60a43e074d..3ce2d65a0d 100644 --- a/src/core/job.h +++ b/src/core/job.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c index debf87130d..22ff067d58 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/kmod-setup.h b/src/core/kmod-setup.h index 496aef3e15..faaaa9ab41 100644 --- a/src/core/kmod-setup.h +++ b/src/core/kmod-setup.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c index d869ee0c76..4323147a01 100644 --- a/src/core/load-dropin.c +++ b/src/core/load-dropin.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/load-dropin.h b/src/core/load-dropin.h index cf3a799381..0b613c53f1 100644 --- a/src/core/load-dropin.h +++ b/src/core/load-dropin.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 637c82b427..1665be82a0 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h index 79fc76da92..03e13a9c8c 100644 --- a/src/core/load-fragment.h +++ b/src/core/load-fragment.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c index 7f692e9c5d..aab454e83b 100644 --- a/src/core/locale-setup.c +++ b/src/core/locale-setup.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/locale-setup.h b/src/core/locale-setup.h index 09a6bc682d..418fdfae1a 100644 --- a/src/core/locale-setup.h +++ b/src/core/locale-setup.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/manager.c b/src/core/manager.c index 312527aa9c..6be8e8fbe2 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/manager.h b/src/core/manager.h index 9ecc926cbf..39e16aee98 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/mount.c b/src/core/mount.c index 7dbeaf9cf0..6c768a3d02 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/mount.h b/src/core/mount.h index 9318444249..3153a2a99d 100644 --- a/src/core/mount.h +++ b/src/core/mount.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/namespace.c b/src/core/namespace.c index 09bc82909f..da555cd23c 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/namespace.h b/src/core/namespace.h index 7cf1dedd32..eb912e9e2d 100644 --- a/src/core/namespace.h +++ b/src/core/namespace.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/path.c b/src/core/path.c index 1d50885ed4..0f23f1494d 100644 --- a/src/core/path.c +++ b/src/core/path.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/path.h b/src/core/path.h index efb6b5eb44..1b4d0d49d4 100644 --- a/src/core/path.h +++ b/src/core/path.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/polkit.h b/src/core/polkit.h index 0d08194b26..5aecfff635 100644 --- a/src/core/polkit.h +++ b/src/core/polkit.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c index a7e1fa4007..d8643bc162 100644 --- a/src/core/selinux-setup.c +++ b/src/core/selinux-setup.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/selinux-setup.h b/src/core/selinux-setup.h index 6b8fe00b7d..e9a45f589a 100644 --- a/src/core/selinux-setup.h +++ b/src/core/selinux-setup.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/service.c b/src/core/service.c index bf2e0a9d98..1c04ed338a 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/service.h b/src/core/service.h index 60b10516eb..eb41314931 100644 --- a/src/core/service.h +++ b/src/core/service.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/snapshot.c b/src/core/snapshot.c index 82ec5104db..5bb3c4a8fd 100644 --- a/src/core/snapshot.c +++ b/src/core/snapshot.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/snapshot.h b/src/core/snapshot.h index bf92e99a8b..9c63216421 100644 --- a/src/core/snapshot.h +++ b/src/core/snapshot.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/socket.c b/src/core/socket.c index 5b24b3422b..37a0236156 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/socket.h b/src/core/socket.h index 6470d8b63e..576506fef7 100644 --- a/src/core/socket.h +++ b/src/core/socket.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/special.h b/src/core/special.h index 43e2e6f6d7..f1ff1b94c0 100644 --- a/src/core/special.h +++ b/src/core/special.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/swap.c b/src/core/swap.c index 9c72732b94..6331864d8c 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/swap.h b/src/core/swap.h index 62d08da30b..5c0ef73026 100644 --- a/src/core/swap.h +++ b/src/core/swap.h @@ -10,16 +10,16 @@ Copyright 2010 Maarten Lankhorst 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 . ***/ diff --git a/src/core/sysfs-show.h b/src/core/sysfs-show.h index 9939e8b069..51d73fb151 100644 --- a/src/core/sysfs-show.h +++ b/src/core/sysfs-show.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/core/target.c b/src/core/target.c index 6c1e0c368a..f99b2a5af0 100644 --- a/src/core/target.c +++ b/src/core/target.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/target.h b/src/core/target.h index 5b97c86fbf..62bc34382b 100644 --- a/src/core/target.h +++ b/src/core/target.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/tcpwrap.c b/src/core/tcpwrap.c index 0aab1427dd..6c630fac60 100644 --- a/src/core/tcpwrap.c +++ b/src/core/tcpwrap.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/tcpwrap.h b/src/core/tcpwrap.h index 4d4553e8ae..0c87b111ee 100644 --- a/src/core/tcpwrap.h +++ b/src/core/tcpwrap.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/timer.c b/src/core/timer.c index e318fee201..6bd4cc359c 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/timer.h b/src/core/timer.h index f5c5c64f25..985b460ab1 100644 --- a/src/core/timer.h +++ b/src/core/timer.h @@ -9,16 +9,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 . ***/ diff --git a/src/core/unit.c b/src/core/unit.c index 9e33701c8f..df79fe3a69 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -6,16 +6,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 . ***/ diff --git a/src/core/unit.h b/src/core/unit.h index 756f465da3..d8f4644ca9 100644 --- a/src/core/unit.h +++ b/src/core/unit.h @@ -9,16 +9,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 . ***/ diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index 5e92fb9af8..4d10373a79 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -6,16 +6,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 . ***/ diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index ac7b6d6c38..f214d60d56 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -6,16 +6,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 . ***/ diff --git a/src/dbus-common.c b/src/dbus-common.c index fc97108e95..038fdd41a0 100644 --- a/src/dbus-common.c +++ b/src/dbus-common.c @@ -6,16 +6,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 . ***/ diff --git a/src/dbus-common.h b/src/dbus-common.h index 892d1297fe..38d8e6538c 100644 --- a/src/dbus-common.h +++ b/src/dbus-common.h @@ -9,16 +9,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 . ***/ diff --git a/src/dbus-loop.c b/src/dbus-loop.c index 8eb1d171a7..da0a00443a 100644 --- a/src/dbus-loop.c +++ b/src/dbus-loop.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/def.h b/src/def.h index 20aaa7c580..be969fca2e 100644 --- a/src/def.h +++ b/src/def.h @@ -9,16 +9,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 . ***/ diff --git a/src/detect-virt.c b/src/detect-virt.c index 79cad5d8ab..b3d8fb53a4 100644 --- a/src/detect-virt.c +++ b/src/detect-virt.c @@ -6,16 +6,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 . ***/ diff --git a/src/fsck.c b/src/fsck.c index d3ac83c25e..f25ec49442 100644 --- a/src/fsck.c +++ b/src/fsck.c @@ -6,16 +6,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 . ***/ diff --git a/src/getty-generator.c b/src/getty-generator.c index dc979e9e8e..58ad8a6635 100644 --- a/src/getty-generator.c +++ b/src/getty-generator.c @@ -6,16 +6,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 . ***/ diff --git a/src/hostname-setup.c b/src/hostname-setup.c index 2c2f10cfd1..550d3c2113 100644 --- a/src/hostname-setup.c +++ b/src/hostname-setup.c @@ -6,16 +6,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 . ***/ diff --git a/src/hostname-setup.h b/src/hostname-setup.h index ff11df945e..9550b8c5ab 100644 --- a/src/hostname-setup.h +++ b/src/hostname-setup.h @@ -9,16 +9,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 . ***/ diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index ad72440845..67c56f3313 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/hostname/org.freedesktop.hostname1.conf b/src/hostname/org.freedesktop.hostname1.conf index eb241c022f..46b4aadc83 100644 --- a/src/hostname/org.freedesktop.hostname1.conf +++ b/src/hostname/org.freedesktop.hostname1.conf @@ -6,8 +6,8 @@ This file is part of systemd. 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. --> diff --git a/src/hostname/org.freedesktop.hostname1.policy.in b/src/hostname/org.freedesktop.hostname1.policy.in index 7d56b22c28..df082d8e6f 100644 --- a/src/hostname/org.freedesktop.hostname1.policy.in +++ b/src/hostname/org.freedesktop.hostname1.policy.in @@ -6,8 +6,8 @@ This file is part of systemd. 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. --> diff --git a/src/hostname/org.freedesktop.hostname1.service b/src/hostname/org.freedesktop.hostname1.service index 42e4adb2c9..6041ed60ca 100644 --- a/src/hostname/org.freedesktop.hostname1.service +++ b/src/hostname/org.freedesktop.hostname1.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [D-BUS Service] diff --git a/src/initctl.c b/src/initctl.c index 53d03a9e10..0eb008d9e6 100644 --- a/src/initctl.c +++ b/src/initctl.c @@ -6,16 +6,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 . ***/ diff --git a/src/install.c b/src/install.c index 45018043c2..080ae6a01d 100644 --- a/src/install.c +++ b/src/install.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/install.h b/src/install.h index 0505a82f00..d365c01bc7 100644 --- a/src/install.h +++ b/src/install.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/journal/cat.c b/src/journal/cat.c index f0a666642c..cdd46bcf5b 100644 --- a/src/journal/cat.c +++ b/src/journal/cat.c @@ -6,16 +6,16 @@ Copyright 2012 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 . ***/ diff --git a/src/journal/compress.c b/src/journal/compress.c index ff906581f0..75e70c5ffa 100644 --- a/src/journal/compress.c +++ b/src/journal/compress.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/journal/compress.h b/src/journal/compress.h index f187a6e00c..1cdfe3d481 100644 --- a/src/journal/compress.h +++ b/src/journal/compress.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/journal/coredump.c b/src/journal/coredump.c index 5ecdef37a7..db805d6cb5 100644 --- a/src/journal/coredump.c +++ b/src/journal/coredump.c @@ -6,16 +6,16 @@ Copyright 2012 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 . ***/ diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h index 9cb8051082..d1174456cb 100644 --- a/src/journal/journal-def.h +++ b/src/journal/journal-def.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index be92c90447..973c51f802 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h index 57d66cafc5..aeb6d46c79 100644 --- a/src/journal/journal-file.h +++ b/src/journal/journal-file.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h index 17f1d317c7..bcffa35055 100644 --- a/src/journal/journal-internal.h +++ b/src/journal/journal-internal.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/journal/journal-rate-limit.c b/src/journal/journal-rate-limit.c index 243ff2a378..25ea437ea3 100644 --- a/src/journal/journal-rate-limit.c +++ b/src/journal/journal-rate-limit.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/journal/journal-rate-limit.h b/src/journal/journal-rate-limit.h index 2bbdd5f9fe..cbf526c64f 100644 --- a/src/journal/journal-rate-limit.h +++ b/src/journal/journal-rate-limit.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c index 32e94af91f..4c9753cec1 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 01dceca237..ebc2a6aa49 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/journal/journald.c b/src/journal/journald.c index ea23cff26e..1549e6e039 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/journal/journald.conf b/src/journal/journald.conf index 710b0aa941..26bdc36baa 100644 --- a/src/journal/journald.conf +++ b/src/journal/journald.conf @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # # See system-journald.conf(5) for details diff --git a/src/journal/journald.h b/src/journal/journald.h index 7840fd5730..3c69f7ec24 100644 --- a/src/journal/journald.h +++ b/src/journal/journald.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/journal/libsystemd-journal.pc.in b/src/journal/libsystemd-journal.pc.in index 13cc8208df..9883595644 100644 --- a/src/journal/libsystemd-journal.pc.in +++ b/src/journal/libsystemd-journal.pc.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. prefix=@prefix@ diff --git a/src/journal/libsystemd-journal.sym b/src/journal/libsystemd-journal.sym index cd434aea26..3ebcd28aa1 100644 --- a/src/journal/libsystemd-journal.sym +++ b/src/journal/libsystemd-journal.sym @@ -2,8 +2,8 @@ This file is part of systemd. 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. ***/ diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index 92ba57822b..9d381e044c 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/journal/test-journal-send.c b/src/journal/test-journal-send.c index 2f9987dcde..d682abbf01 100644 --- a/src/journal/test-journal-send.c +++ b/src/journal/test-journal-send.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c index a023509b70..39f4c16778 100644 --- a/src/journal/test-journal.c +++ b/src/journal/test-journal.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/libsystemd-id128.pc.in b/src/libsystemd-id128.pc.in index 4d984fdff5..bb65ffde33 100644 --- a/src/libsystemd-id128.pc.in +++ b/src/libsystemd-id128.pc.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. prefix=@prefix@ diff --git a/src/libsystemd-id128.sym b/src/libsystemd-id128.sym index 2373fe6646..604c0026c6 100644 --- a/src/libsystemd-id128.sym +++ b/src/libsystemd-id128.sym @@ -2,8 +2,8 @@ This file is part of systemd. 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. ***/ diff --git a/src/locale/localed.c b/src/locale/localed.c index e6aaa5cab3..d582a9cbab 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/locale/org.freedesktop.locale1.conf b/src/locale/org.freedesktop.locale1.conf index 68273311e7..79d0ecd2bb 100644 --- a/src/locale/org.freedesktop.locale1.conf +++ b/src/locale/org.freedesktop.locale1.conf @@ -6,8 +6,8 @@ This file is part of systemd. 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. --> diff --git a/src/locale/org.freedesktop.locale1.policy.in b/src/locale/org.freedesktop.locale1.policy.in index 1ac50bf86c..91296c2356 100644 --- a/src/locale/org.freedesktop.locale1.policy.in +++ b/src/locale/org.freedesktop.locale1.policy.in @@ -6,8 +6,8 @@ This file is part of systemd. 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. --> diff --git a/src/locale/org.freedesktop.locale1.service b/src/locale/org.freedesktop.locale1.service index 29bd582459..025f9a0fc2 100644 --- a/src/locale/org.freedesktop.locale1.service +++ b/src/locale/org.freedesktop.locale1.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [D-BUS Service] diff --git a/src/login/70-uaccess.rules b/src/login/70-uaccess.rules index 18dd4433e7..ca7ca133a3 100644 --- a/src/login/70-uaccess.rules +++ b/src/login/70-uaccess.rules @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. ACTION=="remove", GOTO="uaccess_end" diff --git a/src/login/71-seat.rules b/src/login/71-seat.rules index 04ccac7570..52750f7885 100644 --- a/src/login/71-seat.rules +++ b/src/login/71-seat.rules @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. ACTION=="remove", GOTO="seat_end" diff --git a/src/login/73-seat-late.rules.in b/src/login/73-seat-late.rules.in index 933c952b97..901df750fd 100644 --- a/src/login/73-seat-late.rules.in +++ b/src/login/73-seat-late.rules.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. ACTION=="remove", GOTO="seat_late_end" diff --git a/src/login/libsystemd-login.pc.in b/src/login/libsystemd-login.pc.in index cd36a9cb35..7b2a7245fc 100644 --- a/src/login/libsystemd-login.pc.in +++ b/src/login/libsystemd-login.pc.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. prefix=@prefix@ diff --git a/src/login/libsystemd-login.sym b/src/login/libsystemd-login.sym index a5e6c1e756..0fd61e000b 100644 --- a/src/login/libsystemd-login.sym +++ b/src/login/libsystemd-login.sym @@ -2,8 +2,8 @@ This file is part of systemd. 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. ***/ diff --git a/src/login/loginctl.c b/src/login/loginctl.c index 2633b47e1c..c4604909cd 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -6,16 +6,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 . ***/ diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c index eb8a48d191..cb045a9928 100644 --- a/src/login/logind-acl.c +++ b/src/login/logind-acl.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/logind-acl.h b/src/login/logind-acl.h index 72740f5b95..ea34590bd1 100644 --- a/src/login/logind-acl.h +++ b/src/login/logind-acl.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 1c6dc979ed..6b013b9fb2 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/logind-device.c b/src/login/logind-device.c index bbd370fbff..828e1efe4a 100644 --- a/src/login/logind-device.c +++ b/src/login/logind-device.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/logind-device.h b/src/login/logind-device.h index e25a5344ef..bdb9741727 100644 --- a/src/login/logind-device.h +++ b/src/login/logind-device.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c index 95ef5ffdb5..4bf9bf7b1f 100644 --- a/src/login/logind-seat-dbus.c +++ b/src/login/logind-seat-dbus.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c index 906ede6cda..1bae6f6e07 100644 --- a/src/login/logind-seat.c +++ b/src/login/logind-seat.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/logind-seat.h b/src/login/logind-seat.h index 3b2c7f0965..d41320da46 100644 --- a/src/login/logind-seat.h +++ b/src/login/logind-seat.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c index 102f8ac99b..0780f3f42a 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 641678210f..cbc4b5cf3c 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/logind-session.h b/src/login/logind-session.h index d0b8c87fab..1afbdcc410 100644 --- a/src/login/logind-session.h +++ b/src/login/logind-session.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c index a9d680f899..2d3375a09c 100644 --- a/src/login/logind-user-dbus.c +++ b/src/login/logind-user-dbus.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 92ba2c2208..27f78adae1 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/logind-user.h b/src/login/logind-user.h index db9a5f6a34..78249ac647 100644 --- a/src/login/logind-user.h +++ b/src/login/logind-user.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/logind.c b/src/login/logind.c index a54195cebb..67117405e6 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/logind.conf b/src/login/logind.conf index 24b9d77a67..6a2cefa576 100644 --- a/src/login/logind.conf +++ b/src/login/logind.conf @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # # See logind.conf(5) for details diff --git a/src/login/logind.h b/src/login/logind.h index 9586793ad4..a3080371d0 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/multi-seat-x.c b/src/login/multi-seat-x.c index 96554462a8..32d868888f 100644 --- a/src/login/multi-seat-x.c +++ b/src/login/multi-seat-x.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf index 9ef852bb73..7ebf9ea99c 100644 --- a/src/login/org.freedesktop.login1.conf +++ b/src/login/org.freedesktop.login1.conf @@ -6,8 +6,8 @@ This file is part of systemd. 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. --> diff --git a/src/login/org.freedesktop.login1.policy.in b/src/login/org.freedesktop.login1.policy.in index adc904886d..fb5c539d50 100644 --- a/src/login/org.freedesktop.login1.policy.in +++ b/src/login/org.freedesktop.login1.policy.in @@ -6,8 +6,8 @@ This file is part of systemd. 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. --> diff --git a/src/login/org.freedesktop.login1.service b/src/login/org.freedesktop.login1.service index 4a64177e30..762dae2bb3 100644 --- a/src/login/org.freedesktop.login1.service +++ b/src/login/org.freedesktop.login1.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [D-BUS Service] diff --git a/src/login/pam-module.c b/src/login/pam-module.c index 1edb91c804..0727164db2 100644 --- a/src/login/pam-module.c +++ b/src/login/pam-module.c @@ -6,16 +6,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 . ***/ diff --git a/src/login/sd-login.c b/src/login/sd-login.c index 887c421009..8e5667c705 100644 --- a/src/login/sd-login.c +++ b/src/login/sd-login.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c index b8b356d77b..b0edc33b80 100644 --- a/src/login/sysfs-show.c +++ b/src/login/sysfs-show.c @@ -6,16 +6,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 . ***/ diff --git a/src/login/test-login.c b/src/login/test-login.c index dd8404285b..707cf21589 100644 --- a/src/login/test-login.c +++ b/src/login/test-login.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/uaccess.c b/src/login/uaccess.c index e1af5bf431..2c530c8f39 100644 --- a/src/login/uaccess.c +++ b/src/login/uaccess.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/login/user-sessions.c b/src/login/user-sessions.c index 64aa3bb1c6..98b36c60e8 100644 --- a/src/login/user-sessions.c +++ b/src/login/user-sessions.c @@ -6,16 +6,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 . ***/ diff --git a/src/logs-show.c b/src/logs-show.c index 42d84edbaf..fedb4532db 100644 --- a/src/logs-show.c +++ b/src/logs-show.c @@ -6,16 +6,16 @@ Copyright 2012 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 . ***/ diff --git a/src/logs-show.h b/src/logs-show.h index db9c7e34ab..94caed5579 100644 --- a/src/logs-show.h +++ b/src/logs-show.h @@ -9,16 +9,16 @@ Copyright 2012 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 . ***/ diff --git a/src/loopback-setup.c b/src/loopback-setup.c index b6359def7f..46c1fc843a 100644 --- a/src/loopback-setup.c +++ b/src/loopback-setup.c @@ -6,16 +6,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 . ***/ diff --git a/src/loopback-setup.h b/src/loopback-setup.h index 81f4529630..cbb969e1e4 100644 --- a/src/loopback-setup.h +++ b/src/loopback-setup.h @@ -9,16 +9,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 . ***/ diff --git a/src/machine-id-main.c b/src/machine-id-main.c index 03970a2b06..ca8af596f7 100644 --- a/src/machine-id-main.c +++ b/src/machine-id-main.c @@ -6,16 +6,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 . ***/ diff --git a/src/machine-id-setup.c b/src/machine-id-setup.c index 94198cb83b..9e84ac0cb9 100644 --- a/src/machine-id-setup.c +++ b/src/machine-id-setup.c @@ -6,16 +6,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 . ***/ diff --git a/src/machine-id-setup.h b/src/machine-id-setup.h index 4d0a9cf331..16f45d86d3 100644 --- a/src/machine-id-setup.h +++ b/src/machine-id-setup.h @@ -9,16 +9,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 . ***/ diff --git a/src/main.c b/src/main.c index 4e800e7430..8c115bd548 100644 --- a/src/main.c +++ b/src/main.c @@ -6,16 +6,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 . ***/ diff --git a/src/missing.h b/src/missing.h index 095bf1fe04..5951e06cfc 100644 --- a/src/missing.h +++ b/src/missing.h @@ -9,16 +9,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 . ***/ diff --git a/src/modules-load.c b/src/modules-load.c index ff1f690aac..0f2144c2ed 100644 --- a/src/modules-load.c +++ b/src/modules-load.c @@ -6,16 +6,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 . ***/ diff --git a/src/mount-setup.c b/src/mount-setup.c index dd7938ebe7..52fe523674 100644 --- a/src/mount-setup.c +++ b/src/mount-setup.c @@ -6,16 +6,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 . ***/ diff --git a/src/mount-setup.h b/src/mount-setup.h index c1a27ba6bd..720b66f76c 100644 --- a/src/mount-setup.h +++ b/src/mount-setup.h @@ -9,16 +9,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 . ***/ diff --git a/src/notify.c b/src/notify.c index 943808eb0d..ffc8dfeb9b 100644 --- a/src/notify.c +++ b/src/notify.c @@ -6,16 +6,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 . ***/ diff --git a/src/nspawn.c b/src/nspawn.c index 8c4f49a1ed..5a04404587 100644 --- a/src/nspawn.c +++ b/src/nspawn.c @@ -6,16 +6,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 . ***/ diff --git a/src/org.freedesktop.systemd1.conf b/src/org.freedesktop.systemd1.conf index 201afe65be..a07a8e1ce3 100644 --- a/src/org.freedesktop.systemd1.conf +++ b/src/org.freedesktop.systemd1.conf @@ -6,8 +6,8 @@ This file is part of systemd. 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. --> diff --git a/src/org.freedesktop.systemd1.policy.in.in b/src/org.freedesktop.systemd1.policy.in.in index 1771314e09..51bdafac45 100644 --- a/src/org.freedesktop.systemd1.policy.in.in +++ b/src/org.freedesktop.systemd1.policy.in.in @@ -6,8 +6,8 @@ This file is part of systemd. 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. --> diff --git a/src/org.freedesktop.systemd1.service b/src/org.freedesktop.systemd1.service index 7e1dfd47e0..d4df3e93a2 100644 --- a/src/org.freedesktop.systemd1.service +++ b/src/org.freedesktop.systemd1.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [D-BUS Service] diff --git a/src/path-lookup.c b/src/path-lookup.c index d33ebc71be..1d95f7d1f8 100644 --- a/src/path-lookup.c +++ b/src/path-lookup.c @@ -6,16 +6,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 . ***/ diff --git a/src/path-lookup.h b/src/path-lookup.h index fc2887d3c7..e8a5a77a7b 100644 --- a/src/path-lookup.h +++ b/src/path-lookup.h @@ -9,16 +9,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 . ***/ diff --git a/src/polkit.c b/src/polkit.c index 3acbdc6135..07d18e7d5f 100644 --- a/src/polkit.c +++ b/src/polkit.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/quotacheck.c b/src/quotacheck.c index b6648b8369..e4420eeb1b 100644 --- a/src/quotacheck.c +++ b/src/quotacheck.c @@ -6,16 +6,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 . ***/ diff --git a/src/random-seed.c b/src/random-seed.c index c1022c719f..d1cab8b87a 100644 --- a/src/random-seed.c +++ b/src/random-seed.c @@ -6,16 +6,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 . ***/ diff --git a/src/rc-local-generator.c b/src/rc-local-generator.c index 108827d699..42d7ae41ed 100644 --- a/src/rc-local-generator.c +++ b/src/rc-local-generator.c @@ -7,16 +7,16 @@ Copyright 2011 Michal Schmidt 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 . ***/ diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c index 7e6c243b5e..3e91d5c28a 100644 --- a/src/readahead/readahead-collect.c +++ b/src/readahead/readahead-collect.c @@ -6,16 +6,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 . ***/ diff --git a/src/readahead/readahead-common.c b/src/readahead/readahead-common.c index 67214ec379..4e8e636975 100644 --- a/src/readahead/readahead-common.c +++ b/src/readahead/readahead-common.c @@ -6,16 +6,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 . ***/ diff --git a/src/readahead/readahead-common.h b/src/readahead/readahead-common.h index 9547ad201c..b4eab71b1a 100644 --- a/src/readahead/readahead-common.h +++ b/src/readahead/readahead-common.h @@ -9,16 +9,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 . ***/ diff --git a/src/readahead/readahead-replay.c b/src/readahead/readahead-replay.c index 0c739c82be..7c263f6e53 100644 --- a/src/readahead/readahead-replay.c +++ b/src/readahead/readahead-replay.c @@ -6,16 +6,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 . ***/ diff --git a/src/remount-api-vfs.c b/src/remount-api-vfs.c index 3e146ebb5c..6cb77c1d1a 100644 --- a/src/remount-api-vfs.c +++ b/src/remount-api-vfs.c @@ -6,16 +6,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 . ***/ diff --git a/src/reply-password.c b/src/reply-password.c index 3a96049d7f..a935d0f084 100644 --- a/src/reply-password.c +++ b/src/reply-password.c @@ -6,16 +6,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 . ***/ diff --git a/src/sd-id128.c b/src/sd-id128.c index b4184e1c7e..4286ae7d14 100644 --- a/src/sd-id128.c +++ b/src/sd-id128.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c index a2a9f9a22b..d1eb6f2268 100644 --- a/src/shared/acl-util.c +++ b/src/shared/acl-util.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h index 798ce43364..9f11636aa1 100644 --- a/src/shared/acl-util.h +++ b/src/shared/acl-util.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/shared/audit.c b/src/shared/audit.c index 3850059132..e5c483ab08 100644 --- a/src/shared/audit.c +++ b/src/shared/audit.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/audit.h b/src/shared/audit.h index 3529046ff3..f2740bc42c 100644 --- a/src/shared/audit.h +++ b/src/shared/audit.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/capability.c b/src/shared/capability.c index b8002159ec..b2cd9ed75e 100644 --- a/src/shared/capability.c +++ b/src/shared/capability.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/capability.h b/src/shared/capability.h index ab7e40b601..9f9c49cf5b 100644 --- a/src/shared/capability.h +++ b/src/shared/capability.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/cgroup-label.c b/src/shared/cgroup-label.c index f9a42c679e..f132d71e21 100644 --- a/src/shared/cgroup-label.c +++ b/src/shared/cgroup-label.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c index ad677d4262..86f354dbe7 100644 --- a/src/shared/cgroup-util.c +++ b/src/shared/cgroup-util.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/cgroup-util.h b/src/shared/cgroup-util.h index 37e4255a9c..5da0004d81 100644 --- a/src/shared/cgroup-util.h +++ b/src/shared/cgroup-util.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index a9b01135e6..30980a3ea2 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h index be7d708171..d37029f083 100644 --- a/src/shared/conf-parser.h +++ b/src/shared/conf-parser.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/exit-status.c b/src/shared/exit-status.c index ab8907d32c..b07a66a3e2 100644 --- a/src/shared/exit-status.c +++ b/src/shared/exit-status.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/exit-status.h b/src/shared/exit-status.h index 44ef879562..349e24fbf2 100644 --- a/src/shared/exit-status.h +++ b/src/shared/exit-status.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/hashmap.c b/src/shared/hashmap.c index 6928118615..5d1e63208a 100644 --- a/src/shared/hashmap.c +++ b/src/shared/hashmap.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/hashmap.h b/src/shared/hashmap.h index ab4363a7a3..fcf2cb1c81 100644 --- a/src/shared/hashmap.h +++ b/src/shared/hashmap.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/label.c b/src/shared/label.c index 2c887a0fe5..dce6f45c80 100644 --- a/src/shared/label.c +++ b/src/shared/label.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/label.h b/src/shared/label.h index ead44837a4..ccf405bbe0 100644 --- a/src/shared/label.h +++ b/src/shared/label.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/list.h b/src/shared/list.h index 2bec8c9e73..9a491b990e 100644 --- a/src/shared/list.h +++ b/src/shared/list.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/log.c b/src/shared/log.c index 9fffc1dbc0..2151200644 100644 --- a/src/shared/log.c +++ b/src/shared/log.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/log.h b/src/shared/log.h index 3283808ff8..b2f5f2a920 100644 --- a/src/shared/log.h +++ b/src/shared/log.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/macro.h b/src/shared/macro.h index 19f259e4f1..1355aac908 100644 --- a/src/shared/macro.h +++ b/src/shared/macro.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/mkdir.c b/src/shared/mkdir.c index e668cc2558..3d98221296 100644 --- a/src/shared/mkdir.c +++ b/src/shared/mkdir.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/mkdir.h b/src/shared/mkdir.h index c006e7ccdb..b1477c5f63 100644 --- a/src/shared/mkdir.h +++ b/src/shared/mkdir.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/pager.c b/src/shared/pager.c index 3fc81820e9..6a85af33c4 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/pager.h b/src/shared/pager.h index b5b4998445..7d2108f73e 100644 --- a/src/shared/pager.h +++ b/src/shared/pager.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/ratelimit.c b/src/shared/ratelimit.c index 93157c7a2e..1054d52f97 100644 --- a/src/shared/ratelimit.c +++ b/src/shared/ratelimit.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/ratelimit.h b/src/shared/ratelimit.h index a6443e7f87..07e8205c81 100644 --- a/src/shared/ratelimit.h +++ b/src/shared/ratelimit.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/set.c b/src/shared/set.c index 097b9d3aae..20e457eda4 100644 --- a/src/shared/set.c +++ b/src/shared/set.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/set.h b/src/shared/set.h index 885780c4c0..a4653b3a45 100644 --- a/src/shared/set.h +++ b/src/shared/set.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/socket-label.c b/src/shared/socket-label.c index 9ab07a9b31..5158beeda8 100644 --- a/src/shared/socket-label.c +++ b/src/shared/socket-label.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c index 618c928f06..471b6dc284 100644 --- a/src/shared/socket-util.c +++ b/src/shared/socket-util.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/socket-util.h b/src/shared/socket-util.h index 8ccbd371cf..a5a9463f18 100644 --- a/src/shared/socket-util.h +++ b/src/shared/socket-util.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/strv.c b/src/shared/strv.c index f61680d476..18de4f8391 100644 --- a/src/shared/strv.c +++ b/src/shared/strv.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/strv.h b/src/shared/strv.h index 9becf9b575..afb31f385f 100644 --- a/src/shared/strv.h +++ b/src/shared/strv.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/utf8.c b/src/shared/utf8.c index 11619dce2f..13f0521e8c 100644 --- a/src/shared/utf8.c +++ b/src/shared/utf8.c @@ -6,16 +6,16 @@ Copyright 2012 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 . ***/ diff --git a/src/shared/utf8.h b/src/shared/utf8.h index 9a72bec084..af2420fda4 100644 --- a/src/shared/utf8.h +++ b/src/shared/utf8.h @@ -9,16 +9,16 @@ Copyright 2012 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 . ***/ diff --git a/src/shared/util.c b/src/shared/util.c index 7778b0a06b..a3873a9318 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -6,16 +6,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 . ***/ diff --git a/src/shared/util.h b/src/shared/util.h index 062ab6dd05..3f4e49e6bc 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -9,16 +9,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 . ***/ diff --git a/src/shared/virt.c b/src/shared/virt.c index 4c526ff454..b74c513d12 100644 --- a/src/shared/virt.c +++ b/src/shared/virt.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/shared/virt.h b/src/shared/virt.h index f55c9a68fd..0b6dc1a9bd 100644 --- a/src/shared/virt.h +++ b/src/shared/virt.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/shutdown.c b/src/shutdown.c index b0c680a030..cd478b0349 100644 --- a/src/shutdown.c +++ b/src/shutdown.c @@ -6,16 +6,16 @@ Copyright 2010 ProFUSION embedded systems 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 . ***/ diff --git a/src/shutdownd.c b/src/shutdownd.c index 9801b5e19c..0497cd41a0 100644 --- a/src/shutdownd.c +++ b/src/shutdownd.c @@ -6,16 +6,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 . ***/ diff --git a/src/spawn-ask-password-agent.c b/src/spawn-ask-password-agent.c index c77c71340c..c1a9c58681 100644 --- a/src/spawn-ask-password-agent.c +++ b/src/spawn-ask-password-agent.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/spawn-ask-password-agent.h b/src/spawn-ask-password-agent.h index dae039ad05..fa5e7b0260 100644 --- a/src/spawn-ask-password-agent.h +++ b/src/spawn-ask-password-agent.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/spawn-polkit-agent.c b/src/spawn-polkit-agent.c index 97bc9f5e9e..fd72588417 100644 --- a/src/spawn-polkit-agent.c +++ b/src/spawn-polkit-agent.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/spawn-polkit-agent.h b/src/spawn-polkit-agent.h index 34131f019a..b91d20f120 100644 --- a/src/spawn-polkit-agent.h +++ b/src/spawn-polkit-agent.h @@ -9,16 +9,16 @@ Copyright 2012 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 . ***/ diff --git a/src/specifier.c b/src/specifier.c index a9fff88d35..ae00ae10bb 100644 --- a/src/specifier.c +++ b/src/specifier.c @@ -6,16 +6,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 . ***/ diff --git a/src/specifier.h b/src/specifier.h index 041166c90e..57d1fcb35c 100644 --- a/src/specifier.h +++ b/src/specifier.h @@ -9,16 +9,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 . ***/ diff --git a/src/sysctl.c b/src/sysctl.c index 17c6719841..57fba25605 100644 --- a/src/sysctl.c +++ b/src/sysctl.c @@ -6,16 +6,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 . ***/ diff --git a/src/system.conf b/src/system.conf index 36eac07788..83c1f46814 100644 --- a/src/system.conf +++ b/src/system.conf @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # # See systemd.conf(5) for details diff --git a/src/systemctl.c b/src/systemctl.c index 7abd928389..28bdfa96a4 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -6,16 +6,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 . ***/ diff --git a/src/systemd-bash-completion.sh b/src/systemd-bash-completion.sh index 62601de90a..25ab0c5e97 100644 --- a/src/systemd-bash-completion.sh +++ b/src/systemd-bash-completion.sh @@ -3,8 +3,8 @@ # Copyright 2010 Ran Benita # # 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 @@ -12,7 +12,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # 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 . __systemctl() { diff --git a/src/systemd.pc.in b/src/systemd.pc.in index 79470f4edd..49f65b2a65 100644 --- a/src/systemd.pc.in +++ b/src/systemd.pc.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. prefix=@prefix@ diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h index af2841eb77..30cb686557 100644 --- a/src/systemd/sd-id128.h +++ b/src/systemd/sd-id128.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h index f27e461b03..72c23ba522 100644 --- a/src/systemd/sd-journal.h +++ b/src/systemd/sd-journal.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h index 6e99cfc951..f8c3c6913a 100644 --- a/src/systemd/sd-login.h +++ b/src/systemd/sd-login.h @@ -9,16 +9,16 @@ Copyright 2011 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 . ***/ diff --git a/src/systemd/sd-messages.h b/src/systemd/sd-messages.h index c5ac3abd0c..3f7eedd806 100644 --- a/src/systemd/sd-messages.h +++ b/src/systemd/sd-messages.h @@ -9,16 +9,16 @@ Copyright 2012 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 . ***/ diff --git a/src/systemd/sd-shutdown.h b/src/systemd/sd-shutdown.h index 29fcf3417e..cee4350173 100644 --- a/src/systemd/sd-shutdown.h +++ b/src/systemd/sd-shutdown.h @@ -9,16 +9,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 . ***/ diff --git a/src/test-cgroup.c b/src/test-cgroup.c index eb189374fa..e742632032 100644 --- a/src/test-cgroup.c +++ b/src/test-cgroup.c @@ -6,16 +6,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 . ***/ diff --git a/src/test-daemon.c b/src/test-daemon.c index 20c5d1517e..3215f0c560 100644 --- a/src/test-daemon.c +++ b/src/test-daemon.c @@ -6,16 +6,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 . ***/ diff --git a/src/test-engine.c b/src/test-engine.c index 46a2d2cda0..11389a5ac7 100644 --- a/src/test-engine.c +++ b/src/test-engine.c @@ -6,16 +6,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 . ***/ diff --git a/src/test-env-replace.c b/src/test-env-replace.c index 05dbacd7df..4b6b884779 100644 --- a/src/test-env-replace.c +++ b/src/test-env-replace.c @@ -6,16 +6,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 . ***/ diff --git a/src/test-hostname.c b/src/test-hostname.c index 0a08416a17..8c1a60f940 100644 --- a/src/test-hostname.c +++ b/src/test-hostname.c @@ -6,16 +6,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 . ***/ diff --git a/src/test-id128.c b/src/test-id128.c index 617c95568b..bfd743eca3 100644 --- a/src/test-id128.c +++ b/src/test-id128.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/test-install.c b/src/test-install.c index f8e87e0c74..709974f9e5 100644 --- a/src/test-install.c +++ b/src/test-install.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/test-job-type.c b/src/test-job-type.c index 9de21e1823..ba8b307dd3 100644 --- a/src/test-job-type.c +++ b/src/test-job-type.c @@ -6,16 +6,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 . ***/ diff --git a/src/test-loopback.c b/src/test-loopback.c index 9784aaf24b..ab330ac840 100644 --- a/src/test-loopback.c +++ b/src/test-loopback.c @@ -6,16 +6,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 . ***/ diff --git a/src/test-ns.c b/src/test-ns.c index e2bdfc5894..102b005880 100644 --- a/src/test-ns.c +++ b/src/test-ns.c @@ -6,16 +6,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 . ***/ diff --git a/src/test-strv.c b/src/test-strv.c index 1d577dfd3c..5ee4447669 100644 --- a/src/test-strv.c +++ b/src/test-strv.c @@ -6,16 +6,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 . ***/ diff --git a/src/test-watchdog.c b/src/test-watchdog.c index d53fddbb9d..ccb1854708 100644 --- a/src/test-watchdog.c +++ b/src/test-watchdog.c @@ -6,16 +6,16 @@ Copyright 2012 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 . ***/ diff --git a/src/timedate/org.freedesktop.timedate1.conf b/src/timedate/org.freedesktop.timedate1.conf index c9c221b644..36557d5841 100644 --- a/src/timedate/org.freedesktop.timedate1.conf +++ b/src/timedate/org.freedesktop.timedate1.conf @@ -6,8 +6,8 @@ This file is part of systemd. 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. --> diff --git a/src/timedate/org.freedesktop.timedate1.policy.in b/src/timedate/org.freedesktop.timedate1.policy.in index 3d9c2081d6..dd0a54d81a 100644 --- a/src/timedate/org.freedesktop.timedate1.policy.in +++ b/src/timedate/org.freedesktop.timedate1.policy.in @@ -6,8 +6,8 @@ This file is part of systemd. 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. --> diff --git a/src/timedate/org.freedesktop.timedate1.service b/src/timedate/org.freedesktop.timedate1.service index c3120b66cb..875f4bec78 100644 --- a/src/timedate/org.freedesktop.timedate1.service +++ b/src/timedate/org.freedesktop.timedate1.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [D-BUS Service] diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index 6a7d980c3e..4fbee7ccbd 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -6,16 +6,16 @@ Copyright 2011 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 . ***/ diff --git a/src/timestamp.c b/src/timestamp.c index ce5142946a..1152f1b52e 100644 --- a/src/timestamp.c +++ b/src/timestamp.c @@ -6,16 +6,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 . ***/ diff --git a/src/tmpfiles.c b/src/tmpfiles.c index c5f6fc00b3..15913089ba 100644 --- a/src/tmpfiles.c +++ b/src/tmpfiles.c @@ -6,16 +6,16 @@ Copyright 2010 Lennart Poettering, Kay Sievers 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 . ***/ diff --git a/src/tty-ask-password-agent.c b/src/tty-ask-password-agent.c index c928b5f454..9fbd7f5fb2 100644 --- a/src/tty-ask-password-agent.c +++ b/src/tty-ask-password-agent.c @@ -6,16 +6,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 . ***/ diff --git a/src/umount.c b/src/umount.c index 0a63d23a01..24c0947f21 100644 --- a/src/umount.c +++ b/src/umount.c @@ -6,16 +6,16 @@ Copyright 2010 ProFUSION embedded systems 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 . ***/ diff --git a/src/umount.h b/src/umount.h index acdf09acf1..2e2f9c181a 100644 --- a/src/umount.h +++ b/src/umount.h @@ -9,16 +9,16 @@ Copyright 2010 ProFUSION embedded systems 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 . ***/ diff --git a/src/unit-name.c b/src/unit-name.c index 1cbb804561..566cdc51cc 100644 --- a/src/unit-name.c +++ b/src/unit-name.c @@ -6,16 +6,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 . ***/ diff --git a/src/unit-name.h b/src/unit-name.h index e369910aea..4dfb9fa3ce 100644 --- a/src/unit-name.h +++ b/src/unit-name.h @@ -9,16 +9,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 . ***/ diff --git a/src/update-utmp.c b/src/update-utmp.c index 0d177d6164..ec07b92125 100644 --- a/src/update-utmp.c +++ b/src/update-utmp.c @@ -6,16 +6,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 . ***/ diff --git a/src/user.conf b/src/user.conf index 9508a02eec..e02b46bc3a 100644 --- a/src/user.conf +++ b/src/user.conf @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # # See systemd.conf(5) for details diff --git a/src/utmp-wtmp.c b/src/utmp-wtmp.c index 217ae1e2c7..6bba325d3e 100644 --- a/src/utmp-wtmp.c +++ b/src/utmp-wtmp.c @@ -6,16 +6,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 . ***/ diff --git a/src/utmp-wtmp.h b/src/utmp-wtmp.h index a5998ebb21..ab950617a1 100644 --- a/src/utmp-wtmp.h +++ b/src/utmp-wtmp.h @@ -9,16 +9,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 . ***/ diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index 91967891f1..9ce6fae1da 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -6,16 +6,16 @@ Copyright 2010 Kay Sievers 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 . ***/ diff --git a/src/watchdog.c b/src/watchdog.c index 372c16f317..13265e7692 100644 --- a/src/watchdog.c +++ b/src/watchdog.c @@ -6,16 +6,16 @@ Copyright 2012 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 . ***/ diff --git a/src/watchdog.h b/src/watchdog.h index 5ba70798ae..2e00cb9f4b 100644 --- a/src/watchdog.h +++ b/src/watchdog.h @@ -9,16 +9,16 @@ Copyright 2012 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 . ***/ diff --git a/sysctl.d/coredump.conf.in b/sysctl.d/coredump.conf.in index ab19b1e988..5c791b791b 100644 --- a/sysctl.d/coredump.conf.in +++ b/sysctl.d/coredump.conf.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See sysctl.d(5) for details diff --git a/tmpfiles.d/legacy.conf b/tmpfiles.d/legacy.conf index 9198e89dd1..92bd71b98c 100644 --- a/tmpfiles.d/legacy.conf +++ b/tmpfiles.d/legacy.conf @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See tmpfiles.d(5) for details diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf index 2f9b038460..28362e86bc 100644 --- a/tmpfiles.d/systemd.conf +++ b/tmpfiles.d/systemd.conf @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See tmpfiles.d(5) for details diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf index 8915b82ab5..1284fc4700 100644 --- a/tmpfiles.d/tmp.conf +++ b/tmpfiles.d/tmp.conf @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See tmpfiles.d(5) for details diff --git a/tmpfiles.d/x11.conf b/tmpfiles.d/x11.conf index 7f81af62da..ece6a5ce98 100644 --- a/tmpfiles.d/x11.conf +++ b/tmpfiles.d/x11.conf @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See tmpfiles.d(5) for details diff --git a/units/basic.target b/units/basic.target index 0258ca0c03..c3c7ced7c6 100644 --- a/units/basic.target +++ b/units/basic.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/bluetooth.target b/units/bluetooth.target index c66718e113..6b9b5b5442 100644 --- a/units/bluetooth.target +++ b/units/bluetooth.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in index b0ced10aaa..7d0da9b860 100644 --- a/units/console-shell.service.m4.in +++ b/units/console-shell.service.m4.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/cryptsetup.target b/units/cryptsetup.target index 64ee8c6144..af38e5d673 100644 --- a/units/cryptsetup.target +++ b/units/cryptsetup.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/dev-hugepages.mount b/units/dev-hugepages.mount index 72a522e69c..fcc50736e0 100644 --- a/units/dev-hugepages.mount +++ b/units/dev-hugepages.mount @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/dev-mqueue.mount b/units/dev-mqueue.mount index cffdaf773f..a55ac935c4 100644 --- a/units/dev-mqueue.mount +++ b/units/dev-mqueue.mount @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/emergency.service.in b/units/emergency.service.in index 11ff472f6e..c1421ba22c 100644 --- a/units/emergency.service.in +++ b/units/emergency.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/emergency.target b/units/emergency.target index 6a99e05f03..791dbe595c 100644 --- a/units/emergency.target +++ b/units/emergency.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/fedora/halt-local.service b/units/fedora/halt-local.service index a9f6feb320..a0a3a292e7 100644 --- a/units/fedora/halt-local.service +++ b/units/fedora/halt-local.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/fedora/prefdm.service b/units/fedora/prefdm.service index 77a0e9ad7c..51da6c77f1 100644 --- a/units/fedora/prefdm.service +++ b/units/fedora/prefdm.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/fedora/rc-local.service b/units/fedora/rc-local.service index 0bef5c72ab..3b3bda9f6f 100644 --- a/units/fedora/rc-local.service +++ b/units/fedora/rc-local.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # This unit gets pulled automatically into multi-user.target by diff --git a/units/final.target b/units/final.target index 9cfda197b0..d516f38e9e 100644 --- a/units/final.target +++ b/units/final.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/frugalware/display-manager.service b/units/frugalware/display-manager.service index 2376e1977c..a5c475cd9e 100644 --- a/units/frugalware/display-manager.service +++ b/units/frugalware/display-manager.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/fsck-root.service.in b/units/fsck-root.service.in index 4086149128..f2870bdee7 100644 --- a/units/fsck-root.service.in +++ b/units/fsck-root.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/fsck@.service.in b/units/fsck@.service.in index c06684b634..4c595772de 100644 --- a/units/fsck@.service.in +++ b/units/fsck@.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/getty.target b/units/getty.target index e4435dc8e7..f1c926c72d 100644 --- a/units/getty.target +++ b/units/getty.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 index 6b931fb871..762fbfe383 100644 --- a/units/getty@.service.m4 +++ b/units/getty@.service.m4 @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/graphical.target b/units/graphical.target index f2e30341d4..2e82d6f898 100644 --- a/units/graphical.target +++ b/units/graphical.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/halt.service.in b/units/halt.service.in index 42e347043e..b746d1ea35 100644 --- a/units/halt.service.in +++ b/units/halt.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/halt.target b/units/halt.target index 04b42cd3d1..dc908805db 100644 --- a/units/halt.target +++ b/units/halt.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/http-daemon.target b/units/http-daemon.target index 45f10182e9..1de1ec4018 100644 --- a/units/http-daemon.target +++ b/units/http-daemon.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/kexec.service.in b/units/kexec.service.in index cf6bd65615..17d0344972 100644 --- a/units/kexec.service.in +++ b/units/kexec.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/kexec.target b/units/kexec.target index b77e6a43f1..4941f51c91 100644 --- a/units/kexec.target +++ b/units/kexec.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/local-fs-pre.target b/units/local-fs-pre.target index 11e67bac1c..a928c1d79e 100644 --- a/units/local-fs-pre.target +++ b/units/local-fs-pre.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/local-fs.target b/units/local-fs.target index 1886f7499d..2aa51fca8c 100644 --- a/units/local-fs.target +++ b/units/local-fs.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/mageia/prefdm.service b/units/mageia/prefdm.service index 4a896bf582..c85a7a93a8 100644 --- a/units/mageia/prefdm.service +++ b/units/mageia/prefdm.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/mail-transfer-agent.target b/units/mail-transfer-agent.target index ebb1ea125a..94d134e345 100644 --- a/units/mail-transfer-agent.target +++ b/units/mail-transfer-agent.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/mandriva/prefdm.service b/units/mandriva/prefdm.service index 4a896bf582..c85a7a93a8 100644 --- a/units/mandriva/prefdm.service +++ b/units/mandriva/prefdm.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/multi-user.target b/units/multi-user.target index 66f1a950f9..fe19cbcd0b 100644 --- a/units/multi-user.target +++ b/units/multi-user.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/network.target b/units/network.target index d97f64f674..da800da5b0 100644 --- a/units/network.target +++ b/units/network.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/nss-lookup.target b/units/nss-lookup.target index f7b0b5c955..c2d605c8a1 100644 --- a/units/nss-lookup.target +++ b/units/nss-lookup.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/nss-user-lookup.target b/units/nss-user-lookup.target index 40e214897c..0053f0608c 100644 --- a/units/nss-user-lookup.target +++ b/units/nss-user-lookup.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/plymouth-halt.service b/units/plymouth-halt.service index 2e194b360e..5dca3cc622 100644 --- a/units/plymouth-halt.service +++ b/units/plymouth-halt.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/plymouth-kexec.service b/units/plymouth-kexec.service index 919c3f1294..8c36b7583b 100644 --- a/units/plymouth-kexec.service +++ b/units/plymouth-kexec.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/plymouth-poweroff.service b/units/plymouth-poweroff.service index 8fcff3bab1..e69033a8e3 100644 --- a/units/plymouth-poweroff.service +++ b/units/plymouth-poweroff.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/plymouth-quit-wait.service b/units/plymouth-quit-wait.service index 45c67bdabd..55a95ef02d 100644 --- a/units/plymouth-quit-wait.service +++ b/units/plymouth-quit-wait.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/plymouth-quit.service b/units/plymouth-quit.service index 164499a2a6..b68b016664 100644 --- a/units/plymouth-quit.service +++ b/units/plymouth-quit.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/plymouth-read-write.service b/units/plymouth-read-write.service index 09fbf7d4c4..e8ef447b74 100644 --- a/units/plymouth-read-write.service +++ b/units/plymouth-read-write.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/plymouth-reboot.service b/units/plymouth-reboot.service index fb65bcc836..5c52bc6ece 100644 --- a/units/plymouth-reboot.service +++ b/units/plymouth-reboot.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/plymouth-start.service b/units/plymouth-start.service index f618257a93..1f05d5cd7b 100644 --- a/units/plymouth-start.service +++ b/units/plymouth-start.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/poweroff.service.in b/units/poweroff.service.in index 124a4c0f36..851a0f9451 100644 --- a/units/poweroff.service.in +++ b/units/poweroff.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/poweroff.target b/units/poweroff.target index d2ccf4b2c7..b81d6ee0d4 100644 --- a/units/poweroff.target +++ b/units/poweroff.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/printer.target b/units/printer.target index 14c90ff84b..b8582da7ad 100644 --- a/units/printer.target +++ b/units/printer.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount index acbbcbb0cb..6edd1f55d3 100644 --- a/units/proc-sys-fs-binfmt_misc.automount +++ b/units/proc-sys-fs-binfmt_misc.automount @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/proc-sys-fs-binfmt_misc.mount b/units/proc-sys-fs-binfmt_misc.mount index 1829c2162a..ff958ca01b 100644 --- a/units/proc-sys-fs-binfmt_misc.mount +++ b/units/proc-sys-fs-binfmt_misc.mount @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/quotacheck.service.in b/units/quotacheck.service.in index c97b7a4687..d28b533f9c 100644 --- a/units/quotacheck.service.in +++ b/units/quotacheck.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/quotaon.service b/units/quotaon.service index ef2fc8c976..f90a7fe7d9 100644 --- a/units/quotaon.service +++ b/units/quotaon.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/reboot.service.in b/units/reboot.service.in index f320fd886d..e6a8aabd9d 100644 --- a/units/reboot.service.in +++ b/units/reboot.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/reboot.target b/units/reboot.target index 41e133cb76..6d02417eb5 100644 --- a/units/reboot.target +++ b/units/reboot.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/remote-fs-pre.target b/units/remote-fs-pre.target index eca271b3be..8f688ad7af 100644 --- a/units/remote-fs-pre.target +++ b/units/remote-fs-pre.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/remote-fs.target b/units/remote-fs.target index a48f87e5dd..87455a4a99 100644 --- a/units/remote-fs.target +++ b/units/remote-fs.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/remount-rootfs.service b/units/remount-rootfs.service index 7b63752c7e..6ca057ec67 100644 --- a/units/remount-rootfs.service +++ b/units/remount-rootfs.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in index da4c4da03f..c736f83478 100644 --- a/units/rescue.service.m4.in +++ b/units/rescue.service.m4.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/rescue.target b/units/rescue.target index 5bf3f8e8ee..85099a1ee0 100644 --- a/units/rescue.target +++ b/units/rescue.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/rpcbind.target b/units/rpcbind.target index a5cea8c576..5a286ebe6a 100644 --- a/units/rpcbind.target +++ b/units/rpcbind.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4 index d1d14d35e6..ed6912d034 100644 --- a/units/serial-getty@.service.m4 +++ b/units/serial-getty@.service.m4 @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/shutdown.target b/units/shutdown.target index 99a659e92f..1bbef68280 100644 --- a/units/shutdown.target +++ b/units/shutdown.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/sigpwr.target b/units/sigpwr.target index 0ca502dbbe..18a9683fb8 100644 --- a/units/sigpwr.target +++ b/units/sigpwr.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/smartcard.target b/units/smartcard.target index 28dd2bba1a..3e554a0303 100644 --- a/units/smartcard.target +++ b/units/smartcard.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/sockets.target b/units/sockets.target index 22963128d7..ab1b786870 100644 --- a/units/sockets.target +++ b/units/sockets.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/sound.target b/units/sound.target index e53221c7a6..6a17360c10 100644 --- a/units/sound.target +++ b/units/sound.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/suse/halt-local.service b/units/suse/halt-local.service index 796012c0c4..3a3a7930e2 100644 --- a/units/suse/halt-local.service +++ b/units/suse/halt-local.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/suse/rc-local.service b/units/suse/rc-local.service index 2384a18f94..0fd70e0fc9 100644 --- a/units/suse/rc-local.service +++ b/units/suse/rc-local.service @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # This unit gets pulled automatically into multi-user.target by diff --git a/units/swap.target b/units/swap.target index 26dd261d17..4e165424b2 100644 --- a/units/swap.target +++ b/units/swap.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/sys-fs-fuse-connections.mount b/units/sys-fs-fuse-connections.mount index 037471537b..6f3670155a 100644 --- a/units/sys-fs-fuse-connections.mount +++ b/units/sys-fs-fuse-connections.mount @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/sys-kernel-config.mount b/units/sys-kernel-config.mount index d6862bf6bd..9150da4b50 100644 --- a/units/sys-kernel-config.mount +++ b/units/sys-kernel-config.mount @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/sys-kernel-debug.mount b/units/sys-kernel-debug.mount index d9fca1ff3d..85d53072f1 100644 --- a/units/sys-kernel-debug.mount +++ b/units/sys-kernel-debug.mount @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/sysinit.target b/units/sysinit.target index eb9a1c7cc2..5bc568ff22 100644 --- a/units/sysinit.target +++ b/units/sysinit.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/syslog.socket b/units/syslog.socket index 0e211e16e7..f644f6e38b 100644 --- a/units/syslog.socket +++ b/units/syslog.socket @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/syslog.target b/units/syslog.target index 825b26e7bf..92d2576e95 100644 --- a/units/syslog.target +++ b/units/syslog.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/systemd-ask-password-console.path b/units/systemd-ask-password-console.path index c3143d1da6..dc8ab32bcb 100644 --- a/units/systemd-ask-password-console.path +++ b/units/systemd-ask-password-console.path @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-ask-password-console.service.in b/units/systemd-ask-password-console.service.in index 5ff3ed55d7..55e3d8648e 100644 --- a/units/systemd-ask-password-console.service.in +++ b/units/systemd-ask-password-console.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-ask-password-plymouth.path b/units/systemd-ask-password-plymouth.path index 06a587620f..b938ae57cf 100644 --- a/units/systemd-ask-password-plymouth.path +++ b/units/systemd-ask-password-plymouth.path @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-ask-password-plymouth.service.in b/units/systemd-ask-password-plymouth.service.in index 92cbfdbf09..fcc2853642 100644 --- a/units/systemd-ask-password-plymouth.service.in +++ b/units/systemd-ask-password-plymouth.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-ask-password-wall.path b/units/systemd-ask-password-wall.path index 050b73b2e1..73e13616b6 100644 --- a/units/systemd-ask-password-wall.path +++ b/units/systemd-ask-password-wall.path @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-ask-password-wall.service.in b/units/systemd-ask-password-wall.service.in index d8e27bf96b..1db408e55b 100644 --- a/units/systemd-ask-password-wall.service.in +++ b/units/systemd-ask-password-wall.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in index d43497c151..267d5c3fd8 100644 --- a/units/systemd-binfmt.service.in +++ b/units/systemd-binfmt.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-hostnamed.service.in b/units/systemd-hostnamed.service.in index 6efab1e25f..1ed942fe17 100644 --- a/units/systemd-hostnamed.service.in +++ b/units/systemd-hostnamed.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in index 7df3aa6db3..bcadcc8d1a 100644 --- a/units/systemd-initctl.service.in +++ b/units/systemd-initctl.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket index 7a3a0236eb..66597ee107 100644 --- a/units/systemd-initctl.socket +++ b/units/systemd-initctl.socket @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in index 92606b0d88..a3c22c8ffa 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/systemd-journald.socket b/units/systemd-journald.socket index 15fc49ef29..d613e2288f 100644 --- a/units/systemd-journald.socket +++ b/units/systemd-journald.socket @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/systemd-localed.service.in b/units/systemd-localed.service.in index 4be65df75d..ae94bee3c5 100644 --- a/units/systemd-localed.service.in +++ b/units/systemd-localed.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in index 48c1f2c3f0..a16bc81e79 100644 --- a/units/systemd-logind.service.in +++ b/units/systemd-logind.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in index 5dc373d208..72e1d70dce 100644 --- a/units/systemd-modules-load.service.in +++ b/units/systemd-modules-load.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed-load.service.in index a2b6a557dc..6360436021 100644 --- a/units/systemd-random-seed-load.service.in +++ b/units/systemd-random-seed-load.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-random-seed-save.service.in b/units/systemd-random-seed-save.service.in index 9a074cf3fe..219731bae5 100644 --- a/units/systemd-random-seed-save.service.in +++ b/units/systemd-random-seed-save.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-readahead-collect.service.in b/units/systemd-readahead-collect.service.in index 56ba54f0b3..63840b916b 100644 --- a/units/systemd-readahead-collect.service.in +++ b/units/systemd-readahead-collect.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-readahead-done.service.in b/units/systemd-readahead-done.service.in index d665e45f24..893a819a7f 100644 --- a/units/systemd-readahead-done.service.in +++ b/units/systemd-readahead-done.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-readahead-done.timer b/units/systemd-readahead-done.timer index d144bfaece..c64e6ea341 100644 --- a/units/systemd-readahead-done.timer +++ b/units/systemd-readahead-done.timer @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-readahead-replay.service.in b/units/systemd-readahead-replay.service.in index 7c82e408e2..ad27395d9a 100644 --- a/units/systemd-readahead-replay.service.in +++ b/units/systemd-readahead-replay.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-remount-api-vfs.service.in b/units/systemd-remount-api-vfs.service.in index f4df0ca263..d1eba4b17e 100644 --- a/units/systemd-remount-api-vfs.service.in +++ b/units/systemd-remount-api-vfs.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-shutdownd.service.in b/units/systemd-shutdownd.service.in index 657365a451..ec88b23fde 100644 --- a/units/systemd-shutdownd.service.in +++ b/units/systemd-shutdownd.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/systemd-shutdownd.socket b/units/systemd-shutdownd.socket index 7f13c9386e..c97e01a337 100644 --- a/units/systemd-shutdownd.socket +++ b/units/systemd-shutdownd.socket @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in index 6d53422630..692fa3b889 100644 --- a/units/systemd-sysctl.service.in +++ b/units/systemd-sysctl.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-timedated.service.in b/units/systemd-timedated.service.in index 90ff4432ba..4073de58e7 100644 --- a/units/systemd-timedated.service.in +++ b/units/systemd-timedated.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/systemd-tmpfiles-clean.service.in b/units/systemd-tmpfiles-clean.service.in index 3c8e72ebf5..0a8707e138 100644 --- a/units/systemd-tmpfiles-clean.service.in +++ b/units/systemd-tmpfiles-clean.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-tmpfiles-clean.timer b/units/systemd-tmpfiles-clean.timer index d8529a8d7e..c9f89e803d 100644 --- a/units/systemd-tmpfiles-clean.timer +++ b/units/systemd-tmpfiles-clean.timer @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in index f90121e12e..58c3415b1e 100644 --- a/units/systemd-tmpfiles-setup.service.in +++ b/units/systemd-tmpfiles-setup.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in index 614c759a63..0a227cd396 100644 --- a/units/systemd-update-utmp-runlevel.service.in +++ b/units/systemd-update-utmp-runlevel.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in index e7c3c04a00..4af9212700 100644 --- a/units/systemd-update-utmp-shutdown.service.in +++ b/units/systemd-update-utmp-shutdown.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-user-sessions.service.in b/units/systemd-user-sessions.service.in index a93d586a43..363093ee1d 100644 --- a/units/systemd-user-sessions.service.in +++ b/units/systemd-user-sessions.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in index 673fb6ccf6..ef222a5f7d 100644 --- a/units/systemd-vconsole-setup.service.in +++ b/units/systemd-vconsole-setup.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/time-sync.target b/units/time-sync.target index aa34ecb5f4..36b9e7aeea 100644 --- a/units/time-sync.target +++ b/units/time-sync.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/tmp.mount b/units/tmp.mount index de3ec1b657..7367f7e642 100644 --- a/units/tmp.mount +++ b/units/tmp.mount @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] diff --git a/units/umount.target b/units/umount.target index b9ecca6fb1..c583062911 100644 --- a/units/umount.target +++ b/units/umount.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/user/default.target b/units/user/default.target index deb310c2f7..4f9379ea5e 100644 --- a/units/user/default.target +++ b/units/user/default.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/user/exit.service.in b/units/user/exit.service.in index a20b089c9a..c785fbd64a 100644 --- a/units/user/exit.service.in +++ b/units/user/exit.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/user/exit.target b/units/user/exit.target index f34844c0d3..ffc8fad019 100644 --- a/units/user/exit.target +++ b/units/user/exit.target @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. # See systemd.special(7) for details diff --git a/units/user@.service.in b/units/user@.service.in index 91e3b25158..2c154953b1 100644 --- a/units/user@.service.in +++ b/units/user@.service.in @@ -1,8 +1,8 @@ # This file is part of systemd. # # 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. [Unit] -- cgit v1.2.3-54-g00ecf From 8a422bb295516bb85fe1e8dbd7ff03a9e9e1a520 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 21 Jun 2012 22:36:37 +0200 Subject: man: document the new RPM macros in daemon(7) --- man/daemon.xml | 69 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index a7217c84aa..66e198abbc 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -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 -- cgit v1.2.3-54-g00ecf From cb07866b1b7c11e687a322d70dd9f9d73bbbe488 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 13 Jul 2012 01:50:05 +0200 Subject: man: move header file man pages from section 7 to 3 This way we can include documentation about minor macros/inline function within the introducionary man page in a sane way. --- Makefile.am | 20 ++++++++++---------- man/daemon.xml | 6 +++--- man/machine-id.xml | 2 +- man/sd-daemon.xml | 4 ++-- man/sd-id128.xml | 2 +- man/sd-journal.xml | 4 ++-- man/sd-login.xml | 6 +++--- man/sd-readahead.xml | 4 ++-- man/sd_booted.xml | 4 ++-- man/sd_get_seats.xml | 2 +- man/sd_id128_randomize.xml | 4 ++-- man/sd_id128_to_string.xml | 6 +++--- man/sd_is_fifo.xml | 4 ++-- man/sd_journal_print.xml | 2 +- man/sd_listen_fds.xml | 4 ++-- man/sd_login_monitor_new.xml | 2 +- man/sd_notify.xml | 4 ++-- man/sd_pid_get_session.xml | 2 +- man/sd_readahead.xml | 4 ++-- man/sd_seat_get_active.xml | 2 +- man/sd_session_is_active.xml | 2 +- man/sd_uid_get_state.xml | 2 +- man/systemd-journald.service.xml | 2 +- man/systemd.exec.xml | 4 ++-- man/systemd.journal-fields.xml | 2 +- man/systemd.xml | 2 +- src/systemd/sd-daemon.h | 2 +- src/systemd/sd-id128.h | 2 ++ src/systemd/sd-journal.h | 2 ++ src/systemd/sd-login.h | 2 ++ src/systemd/sd-readahead.h | 2 +- 31 files changed, 59 insertions(+), 53 deletions(-) (limited to 'man/daemon.xml') diff --git a/Makefile.am b/Makefile.am index 507ea3acd4..a06b0ca6a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -495,10 +495,10 @@ MANPAGES = \ man/systemd-system-update-generator.8 \ man/systemd-fstab-generator.8 \ man/systemd.preset.5 \ - man/sd-id128.7 \ + man/sd-id128.3 \ man/sd_id128_to_string.3 \ man/sd_id128_randomize.3 \ - man/sd-journal.7 \ + man/sd-journal.3 \ man/sd_journal_print.3 MANPAGES_ALIAS = \ @@ -568,11 +568,11 @@ man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8 man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8 man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8 man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8 -man/sd_id128_t.7: man/sd-id128.7 -man/SD_ID128_MAKE.7: man/sd-id128.7 -man/SD_ID128_FORMAT_STR.7: man/sd-id128.7 -man/SD_ID128_FORMAT_VAL.7: man/sd-id128.7 -man/sd_id128_equal.7: man/sd-id128.7 +man/sd_id128_t.3: man/sd-id128.3 +man/SD_ID128_MAKE.3: man/sd-id128.3 +man/SD_ID128_FORMAT_STR.3: man/sd-id128.3 +man/SD_ID128_FORMAT_VAL.3: man/sd-id128.3 +man/sd_id128_equal.3: man/sd-id128.3 man/sd_id128_from_string.3: man/sd_id128_to_string.3 man/sd_id128_get_machine.3: man/sd_id128_randomize.3 man/sd_id128_get_boot.3: man/sd_id128_randomize.3 @@ -1409,7 +1409,7 @@ pkgconfiglib_DATA += \ src/libsystemd-daemon/libsystemd-daemon.pc MANPAGES += \ - man/sd-daemon.7 \ + man/sd-daemon.3 \ man/sd_notify.3 \ man/sd_listen_fds.3 \ man/sd_is_fifo.3 \ @@ -2535,7 +2535,7 @@ EXTRA_DIST += \ MANPAGES += \ man/sd_readahead.3 \ - man/sd-readahead.7 \ + man/sd-readahead.3 \ man/systemd-readahead-replay.service.8 MANPAGES_ALIAS += \ @@ -3099,7 +3099,7 @@ nodist_udevrules_DATA += \ MANPAGES += \ man/systemd-logind.service.8 \ man/logind.conf.5 \ - man/sd-login.7 \ + man/sd-login.3 \ man/loginctl.1 \ man/sd_login_monitor_new.3 \ man/sd_pid_get_session.3 \ diff --git a/man/daemon.xml b/man/daemon.xml index 66e198abbc..83143dc4b2 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -345,7 +345,7 @@ StandardError=syslog in the service unit file. For details see - sd-daemon7 + sd-daemon3 and systemd.exec5. @@ -468,7 +468,7 @@ 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 @@ -938,7 +938,7 @@ fi See Also systemd1, - sd-daemon7, + sd-daemon3, sd_listen_fds3, sd_notify3, daemon3, diff --git a/man/machine-id.xml b/man/machine-id.xml index a42c7bb5ac..50295a8cd7 100644 --- a/man/machine-id.xml +++ b/man/machine-id.xml @@ -137,7 +137,7 @@ id[8] = (id[8] & 0x3F) | 0x80; hostname5, machine-info5, os-release5, - sd-id1287, + sd-id1283, sd_id128_get_machine3 diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml index 31115a5d69..e29e2fc342 100644 --- a/man/sd-daemon.xml +++ b/man/sd-daemon.xml @@ -39,7 +39,7 @@ sd-daemon - 7 + 3 @@ -164,7 +164,7 @@ systemd.service5, systemd.socket5, fprintf3, - sd-readahead7, + sd-readahead3, pkg-config1 diff --git a/man/sd-id128.xml b/man/sd-id128.xml index ea4e3a4fde..d3f995e008 100644 --- a/man/sd-id128.xml +++ b/man/sd-id128.xml @@ -39,7 +39,7 @@ sd-id128 - 7 + 3 diff --git a/man/sd-journal.xml b/man/sd-journal.xml index 0485458535..a771f0236f 100644 --- a/man/sd-journal.xml +++ b/man/sd-journal.xml @@ -39,7 +39,7 @@ sd-journal - 7 + 3 @@ -117,7 +117,7 @@ sd_journal_get_cursor3, sd_journal_cutoff_realtime_usec3, journalctl1, - sd-id1287, + sd-id1283, pkg-config1 diff --git a/man/sd-login.xml b/man/sd-login.xml index acb78ac689..c02ad0c146 100644 --- a/man/sd-login.xml +++ b/man/sd-login.xml @@ -39,7 +39,7 @@ sd-login - 7 + 3 @@ -137,8 +137,8 @@ sd_seat_get_active3, sd_get_seats3, sd_login_monitor_new3, - sd-daemon7, - sd-readahead7, + sd-daemon3, + sd-readahead3, pkg-config1 diff --git a/man/sd-readahead.xml b/man/sd-readahead.xml index 4eed56ad32..484e1273b2 100644 --- a/man/sd-readahead.xml +++ b/man/sd-readahead.xml @@ -39,7 +39,7 @@ sd-readahead - 7 + 3 @@ -110,7 +110,7 @@ systemd1, sd_readahead3, - sd-daemon7 + sd-daemon3 diff --git a/man/sd_booted.xml b/man/sd_booted.xml index 62d6e57415..23caf5bf1a 100644 --- a/man/sd_booted.xml +++ b/man/sd_booted.xml @@ -109,7 +109,7 @@ may copy the implementation into their source tree. For more details about the reference implementation see - sd_daemon7. + sd-daemon3. If the reference implementation is used as drop-in files and -DDISABLE_SYSTEMD is set during @@ -121,7 +121,7 @@ See Also systemd1, - sd_daemon7 + sd-daemon3 diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml index d30d193a59..28d06e9843 100644 --- a/man/sd_get_seats.xml +++ b/man/sd_get_seats.xml @@ -119,7 +119,7 @@ systemd1, - sd-login7, + sd-login3, sd_session_get_seat3 diff --git a/man/sd_id128_randomize.xml b/man/sd_id128_randomize.xml index 1e23596f4b..cb37419663 100644 --- a/man/sd_id128_randomize.xml +++ b/man/sd_id128_randomize.xml @@ -114,7 +114,7 @@ For more information about the sd_id128_t type see - sd-id1287. + sd-id1283. journalctl1's --new-id command may be used as @@ -148,7 +148,7 @@ systemd1, - sd-id1287, + sd-id1283, machine-id5, random4 diff --git a/man/sd_id128_to_string.xml b/man/sd_id128_to_string.xml index 3a171550e9..eda35b08b1 100644 --- a/man/sd_id128_to_string.xml +++ b/man/sd_id128_to_string.xml @@ -84,7 +84,7 @@ For more information about the sd_id128_t type see - sd-id1287. + sd-id1283. When formatting a 128 bit ID into a string it is often easier to use a format string for @@ -93,7 +93,7 @@ SD_ID128_FORMAT_STR and SD_ID128_FORMAT_VAL() macros. For more information see - sd-id1287. + sd-id1283. @@ -123,7 +123,7 @@ systemd1, - sd-id1287, + sd-id1283, printf3 diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml index 289e1ba138..a41447b63c 100644 --- a/man/sd_is_fifo.xml +++ b/man/sd_is_fifo.xml @@ -196,7 +196,7 @@ may copy the implementation into their source tree. For more details about the reference implementation see - sd_daemon7. + sd-daemon3. These functions continue to work as described, even if -DDISABLE_SYSTEMD is set during @@ -207,7 +207,7 @@ See Also systemd1, - sd-daemon7, + sd-daemon3, sd_listen_fds3, systemd.service5, systemd.socket5 diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml index 2d5d3639c8..71551f779a 100644 --- a/man/sd_journal_print.xml +++ b/man/sd_journal_print.xml @@ -213,7 +213,7 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid( systemd1, - sd-journal7, + sd-journal3, sd_journal_stream_fd3, syslog3, systemd.journal-fields7 diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml index e76630e4ff..003c1b51ea 100644 --- a/man/sd_listen_fds.xml +++ b/man/sd_listen_fds.xml @@ -156,7 +156,7 @@ may copy the implementation into their source tree. For more details about the reference implementation see - sd-daemon7. + sd-daemon3. If the reference implementation is used as drop-in files and -DDISABLE_SYSTEMD is set during @@ -189,7 +189,7 @@ systemd1, - sd-daemon7, + sd-daemon3, sd_is_fifo3, sd_is_socket3, sd_is_socket_inet3, diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml index 4642e99f74..102d943f96 100644 --- a/man/sd_login_monitor_new.xml +++ b/man/sd_login_monitor_new.xml @@ -164,7 +164,7 @@ systemd1, - sd-login7, + sd-login3, sd_get_seats3 diff --git a/man/sd_notify.xml b/man/sd_notify.xml index a91c1bb4bf..1cd5b0aa7e 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -243,7 +243,7 @@ file. Alternatively, applications consuming these APIs may copy the implementation into their source tree. For more details about the reference implementation see - sd_daemon7. + sd-daemon3. If the reference implementation is used as drop-in files and -DDISABLE_SYSTEMD is set during @@ -310,7 +310,7 @@ See Also systemd1, - sd_daemon7, + sd-daemon3, daemon7, systemd.service5 diff --git a/man/sd_pid_get_session.xml b/man/sd_pid_get_session.xml index 9a1b1997d9..7897a2cd3e 100644 --- a/man/sd_pid_get_session.xml +++ b/man/sd_pid_get_session.xml @@ -151,7 +151,7 @@ systemd1, - sd-login7, + sd-login3, sd_session_is_active3, getsid2 diff --git a/man/sd_readahead.xml b/man/sd_readahead.xml index 2a92727881..ff7b355741 100644 --- a/man/sd_readahead.xml +++ b/man/sd_readahead.xml @@ -140,7 +140,7 @@ recommended that applications consuming this API copy the implementation into their source tree. For more details about the reference implementation see - sd-readahead7 + sd-readahead3 If -DDISABLE_SYSTEMD is set during compilation this function will always return 0 and otherwise @@ -170,7 +170,7 @@ sd_readahead("noreplay"); See Also systemd1, - sd-readahead7, + sd-readahead3, daemon7 diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml index 82a1ea0481..fa47378577 100644 --- a/man/sd_seat_get_active.xml +++ b/man/sd_seat_get_active.xml @@ -172,7 +172,7 @@ systemd1, - sd-login7, + sd-login3, sd_session_get_seat3 diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml index a14286aeab..a9107cb95f 100644 --- a/man/sd_session_is_active.xml +++ b/man/sd_session_is_active.xml @@ -232,7 +232,7 @@ systemd1, - sd-login7, + sd-login3, sd_pid_get_session3 diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml index f302b34c60..b9b713c64e 100644 --- a/man/sd_uid_get_state.xml +++ b/man/sd_uid_get_state.xml @@ -181,7 +181,7 @@ systemd1, - sd-login7, + sd-login3, sd_pid_get_owner_uid3 diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml index 3c71a59c95..8ae24d40b3 100644 --- a/man/systemd-journald.service.xml +++ b/man/systemd-journald.service.xml @@ -166,7 +166,7 @@ journalctl1, journald.conf5, systemd.journal-fields7, - sd-journal7 + sd-journal3 diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 01b638f5ac..8d3b3da22e 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -551,7 +551,7 @@ prefixes may be disabled with SyslogLevelPrefix=, see below. For details see - sd-daemon7. + sd-daemon3. Defaults to . @@ -573,7 +573,7 @@ these prefixes is disabled and the logged lines are passed on as-is. For details about this prefixing see - sd-daemon7. + sd-daemon3. Defaults to true. diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml index 4f664f43e5..6a9fd9d85c 100644 --- a/man/systemd.journal-fields.xml +++ b/man/systemd.journal-fields.xml @@ -362,7 +362,7 @@ systemd1, journalctl1, journald.conf5, - sd-journal7 + sd-journal3 diff --git a/man/systemd.xml b/man/systemd.xml index 9ff6495e50..a184b1a401 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -1244,7 +1244,7 @@ systemadm1, systemd-notify1, daemon7, - sd-daemon7, + sd-daemon3, systemd.unit5, systemd.special5, pkg-config1, diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h index fe51159ee6..b204e317be 100644 --- a/src/systemd/sd-daemon.h +++ b/src/systemd/sd-daemon.h @@ -64,7 +64,7 @@ extern "C" { This should compile on non-Linux systems, too, but with the exception of the sd_is_xxx() calls all functions will become NOPs. - See sd-daemon(7) for more information. + See sd-daemon(3) for more information. */ #ifndef _sd_printf_attr_ diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h index 30cb686557..7d5e6c440e 100644 --- a/src/systemd/sd-id128.h +++ b/src/systemd/sd-id128.h @@ -30,6 +30,8 @@ extern "C" { #endif +/* 128 Bit ID APIs. See sd-id128(3) for more information. */ + typedef union sd_id128 sd_id128_t; union sd_id128 { diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h index 74e57f48e0..cf1b8db74b 100644 --- a/src/systemd/sd-journal.h +++ b/src/systemd/sd-journal.h @@ -34,6 +34,8 @@ extern "C" { #endif +/* Journal APIs. See sd-journal(3) for more information. */ + /* Write to daemon */ int sd_journal_print(int priority, const char *format, ...) __attribute__ ((format (printf, 2, 3))); int sd_journal_printv(int priority, const char *format, va_list ap); diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h index 1a36a56b12..6bd1f2da4a 100644 --- a/src/systemd/sd-login.h +++ b/src/systemd/sd-login.h @@ -44,6 +44,8 @@ extern "C" { * These functions access data in /proc, /sys/fs/cgroup and /run. All * of these are virtual file systems, hence the accesses are * relatively cheap. + * + * See sd-login(3) for more information. */ /* Get session from PID. Note that 'shared' processes of a user are diff --git a/src/systemd/sd-readahead.h b/src/systemd/sd-readahead.h index 1f8c5a0caf..2dac104f7a 100644 --- a/src/systemd/sd-readahead.h +++ b/src/systemd/sd-readahead.h @@ -53,7 +53,7 @@ extern "C" { This should compile on non-Linux systems, too, but all functions will become NOPs. - See sd-readahead(7) for more information. + See sd-readahead(3) for more information. */ /* -- cgit v1.2.3-54-g00ecf From 34511ca7b166b0e89d08ff9870b0cf2624a7815f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 16 Jul 2012 18:08:25 +0200 Subject: man: reword man page titles Make sure the man page titles are similar in style and capitalization so that our man page index looks pretty. --- man/bootup.xml | 2 +- man/daemon.xml | 2 +- man/kernel-command-line.xml | 2 +- man/locale.conf.xml | 2 +- man/machine-id.xml | 2 +- man/sd-journal.xml | 2 +- man/sd_booted.xml | 2 +- man/sd_listen_fds.xml | 2 +- man/sd_notify.xml | 2 +- man/systemd-ask-password-console.service.xml | 3 +-- man/systemd-fstab-generator.xml | 2 +- man/systemd-halt.service.xml | 2 +- man/systemd-hostnamed.service.xml | 2 +- man/systemd-initctl.service.xml | 2 +- man/systemd-journald.service.xml | 2 +- man/systemd-localed.service.xml | 2 +- man/systemd-logind.service.xml | 2 +- man/systemd-machine-id-setup.xml | 2 +- man/systemd-notify.xml | 2 +- man/systemd-readahead-replay.service.xml | 2 +- man/systemd-remount-fs.service.xml | 2 +- man/systemd-shutdownd.service.xml | 2 +- man/systemd-suspend.service.xml | 2 +- man/systemd-timedated.service.xml | 2 +- man/systemd-tmpfiles.xml | 2 +- man/systemd-update-utmp-runlevel.service.xml | 4 ++-- man/systemd-user-sessions.service.xml | 2 +- man/systemd.automount.xml | 2 +- man/systemd.conf.xml | 2 +- man/systemd.device.xml | 2 +- man/systemd.exec.xml | 2 +- man/systemd.mount.xml | 2 +- man/systemd.path.xml | 2 +- man/systemd.service.xml | 2 +- man/systemd.snapshot.xml | 2 +- man/systemd.socket.xml | 2 +- man/systemd.swap.xml | 2 +- man/systemd.target.xml | 2 +- man/systemd.timer.xml | 2 +- man/systemd.unit.xml | 2 +- man/systemd.xml | 2 +- man/vconsole.conf.xml | 2 +- 42 files changed, 43 insertions(+), 44 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/bootup.xml b/man/bootup.xml index 760a5a4c29..ae70c953f5 100644 --- a/man/bootup.xml +++ b/man/bootup.xml @@ -44,7 +44,7 @@ bootup - The System Bootup Process + System bootup process diff --git a/man/daemon.xml b/man/daemon.xml index 83143dc4b2..9d43353f90 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -44,7 +44,7 @@ daemon - Writing and Packaging System Daemons + Writing and packaging system daemons diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index d5c3f34c6f..ae705eed0c 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -44,7 +44,7 @@ kernel-command-line - Kernel Command Line Parameters + Kernel command line parameters diff --git a/man/locale.conf.xml b/man/locale.conf.xml index b90efea50c..2cbcdc66de 100644 --- a/man/locale.conf.xml +++ b/man/locale.conf.xml @@ -44,7 +44,7 @@ locale.conf - configuration file for locale settings + Configuration file for locale settings diff --git a/man/machine-id.xml b/man/machine-id.xml index 50295a8cd7..7d424b705b 100644 --- a/man/machine-id.xml +++ b/man/machine-id.xml @@ -44,7 +44,7 @@ machine-id - local machine ID configuration file + Local machine ID configuration file diff --git a/man/sd-journal.xml b/man/sd-journal.xml index a771f0236f..b6241a1767 100644 --- a/man/sd-journal.xml +++ b/man/sd-journal.xml @@ -44,7 +44,7 @@ sd-journal - APIs for submitting and querying log entries to and from the Journal + APIs for submitting and querying log entries to and from the journal diff --git a/man/sd_booted.xml b/man/sd_booted.xml index 23caf5bf1a..83cbd6b20a 100644 --- a/man/sd_booted.xml +++ b/man/sd_booted.xml @@ -44,7 +44,7 @@ sd_booted - Test whether the system is running the systemd init system. + Test whether the system is running the systemd init system diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml index 5e906870c7..f6a9497d56 100644 --- a/man/sd_listen_fds.xml +++ b/man/sd_listen_fds.xml @@ -45,7 +45,7 @@ sd_listen_fds SD_LISTEN_FDS_START - Check for file descriptors passed by the init system. + Check for file descriptors passed by the system manager diff --git a/man/sd_notify.xml b/man/sd_notify.xml index 1cd5b0aa7e..606ee1e57f 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -45,7 +45,7 @@ sd_notify sd_notifyf - Notify init system about start-up completion and other daemon status changes + Notify service manager about start-up completion and other daemon status changes diff --git a/man/systemd-ask-password-console.service.xml b/man/systemd-ask-password-console.service.xml index 0baf882c43..6ca94360ac 100644 --- a/man/systemd-ask-password-console.service.xml +++ b/man/systemd-ask-password-console.service.xml @@ -46,8 +46,7 @@ systemd-ask-password-wall.service systemd-ask-password-wall.path Query the user for system passwords on the - console and via - wall1 + console and via wall diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml index a526bcfdb2..785febd6ce 100644 --- a/man/systemd-fstab-generator.xml +++ b/man/systemd-fstab-generator.xml @@ -42,7 +42,7 @@ systemd-fstab-generator - Unit generator for /etc/fstab + Unit generator for /etc/fstab diff --git a/man/systemd-halt.service.xml b/man/systemd-halt.service.xml index 6957fb984e..ab20f2be45 100644 --- a/man/systemd-halt.service.xml +++ b/man/systemd-halt.service.xml @@ -48,7 +48,7 @@ systemd-reboot.service systemd-kexec.service systemd-shutdown - systemd System Shutdown Logic + System shutdown logic diff --git a/man/systemd-hostnamed.service.xml b/man/systemd-hostnamed.service.xml index f98663fea5..9fee2a096d 100644 --- a/man/systemd-hostnamed.service.xml +++ b/man/systemd-hostnamed.service.xml @@ -45,7 +45,7 @@ systemd-hostnamed.service systemd-hostnamed - systemd Hostname Bus Mechanism + Hostname bus mechanism diff --git a/man/systemd-initctl.service.xml b/man/systemd-initctl.service.xml index d3b537d91a..eda6459b50 100644 --- a/man/systemd-initctl.service.xml +++ b/man/systemd-initctl.service.xml @@ -46,7 +46,7 @@ systemd-initctl.service systemd-initctl.socket systemd-initctl - systemd /dev/initctl Compatibility + /dev/initctl compatibility diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml index 8ae24d40b3..90f9290276 100644 --- a/man/systemd-journald.service.xml +++ b/man/systemd-journald.service.xml @@ -46,7 +46,7 @@ systemd-journald.service systemd-journald.socket systemd-journald - systemd Journal Service + Journal service diff --git a/man/systemd-localed.service.xml b/man/systemd-localed.service.xml index 121508eea5..f0f069b936 100644 --- a/man/systemd-localed.service.xml +++ b/man/systemd-localed.service.xml @@ -45,7 +45,7 @@ systemd-localed.service systemd-localed - systemd Locale Bus Mechanism + Locale bus mechanism diff --git a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml index 436c2772c3..00f34051a3 100644 --- a/man/systemd-logind.service.xml +++ b/man/systemd-logind.service.xml @@ -45,7 +45,7 @@ systemd-logind.service systemd-logind - systemd Login Manager + Login manager diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml index 36e6c55335..25fb63af2d 100644 --- a/man/systemd-machine-id-setup.xml +++ b/man/systemd-machine-id-setup.xml @@ -44,7 +44,7 @@ systemd-machine-id-setup - Initialize the machine ID in /etc/machine-id + Initialize the machine ID in /etc/machine-id diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml index e6c6a5946e..b03492c5c1 100644 --- a/man/systemd-notify.xml +++ b/man/systemd-notify.xml @@ -44,7 +44,7 @@ systemd-notify - Notify init system about start-up completion and other daemon status changes + Notify service manager about start-up completion and other daemon status changes diff --git a/man/systemd-readahead-replay.service.xml b/man/systemd-readahead-replay.service.xml index b56fdb8100..66d253454b 100644 --- a/man/systemd-readahead-replay.service.xml +++ b/man/systemd-readahead-replay.service.xml @@ -48,7 +48,7 @@ systemd-readahead-done.service systemd-readahead-done.timer systemd-readahead - systemd Disk Read Ahead Logic + Disk read ahead logic diff --git a/man/systemd-remount-fs.service.xml b/man/systemd-remount-fs.service.xml index c1df5e6f43..d920c0c400 100644 --- a/man/systemd-remount-fs.service.xml +++ b/man/systemd-remount-fs.service.xml @@ -43,7 +43,7 @@ systemd-remount-fs.service systemd-remount-fs - Remount Root and Kernel File Systems + Remount root and kernel file systems diff --git a/man/systemd-shutdownd.service.xml b/man/systemd-shutdownd.service.xml index c4ace482a6..c1b8ef7a49 100644 --- a/man/systemd-shutdownd.service.xml +++ b/man/systemd-shutdownd.service.xml @@ -46,7 +46,7 @@ systemd-shutdownd.service systemd-shutdownd.socket systemd-shutdownd - systemd scheduled shutdown daemon + Scheduled shutdown service diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml index 1ae742bcd8..d3e08a8f1d 100644 --- a/man/systemd-suspend.service.xml +++ b/man/systemd-suspend.service.xml @@ -46,7 +46,7 @@ systemd-suspend.service systemd-hibernate.service systemd-sleep - systemd System Sleep State Logic + System sleep state logic diff --git a/man/systemd-timedated.service.xml b/man/systemd-timedated.service.xml index 4bc5d9e8cb..56450482d7 100644 --- a/man/systemd-timedated.service.xml +++ b/man/systemd-timedated.service.xml @@ -45,7 +45,7 @@ systemd-timedated.service systemd-timedated - systemd Time and Date Bus Mechanism + Time and date bus mechanism diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml index 63c84910f0..22744c7c41 100644 --- a/man/systemd-tmpfiles.xml +++ b/man/systemd-tmpfiles.xml @@ -48,7 +48,7 @@ systemd-tmpfiles-clean.service systemd-tmpfiles-clean.timer Creates, deletes and cleans up volatile - and temporary files and directories. + and temporary files and directories diff --git a/man/systemd-update-utmp-runlevel.service.xml b/man/systemd-update-utmp-runlevel.service.xml index fee72768cb..0e19581f98 100644 --- a/man/systemd-update-utmp-runlevel.service.xml +++ b/man/systemd-update-utmp-runlevel.service.xml @@ -44,8 +44,8 @@ systemd-update-utmp-runlevel.service systemd-update-utmp-shutdown.service systemd-update-utmp - Write audit an utmp updates at runlevel - changes and shutdown. + Write audit and utmp updates at runlevel + changes and shutdown diff --git a/man/systemd-user-sessions.service.xml b/man/systemd-user-sessions.service.xml index 5c65eb1618..9214ec9c35 100644 --- a/man/systemd-user-sessions.service.xml +++ b/man/systemd-user-sessions.service.xml @@ -43,7 +43,7 @@ systemd-user-sessions.service systemd-user-sessions - Permit user logins after boot, prohibit user logins at shutdown. + Permit user logins after boot, prohibit user logins at shutdown diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml index bf4b5d8214..43006d4dc9 100644 --- a/man/systemd.automount.xml +++ b/man/systemd.automount.xml @@ -44,7 +44,7 @@ systemd.automount - systemd automount configuration files + Automount unit configuration diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml index 804a50ead6..7dc5cc13ce 100644 --- a/man/systemd.conf.xml +++ b/man/systemd.conf.xml @@ -44,7 +44,7 @@ systemd.conf - systemd manager configuration file + System and service manager configuration file diff --git a/man/systemd.device.xml b/man/systemd.device.xml index 78cddd6518..7c05ab035b 100644 --- a/man/systemd.device.xml +++ b/man/systemd.device.xml @@ -44,7 +44,7 @@ systemd.device - systemd device configuration files + Device unit configuration diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 291178679d..c04db12e3b 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -44,7 +44,7 @@ systemd.exec - systemd execution environment configuration + Execution environment configuration diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index 4bf652323e..105afb41ea 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -44,7 +44,7 @@ systemd.mount - systemd mount configuration files + Mount unit configuration diff --git a/man/systemd.path.xml b/man/systemd.path.xml index 2d02318f19..af230291ed 100644 --- a/man/systemd.path.xml +++ b/man/systemd.path.xml @@ -44,7 +44,7 @@ systemd.path - systemd path configuration files + Path unit configuration diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 491c3df1cb..38a4035f67 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -44,7 +44,7 @@ systemd.service - systemd service configuration files + Service unit configuration diff --git a/man/systemd.snapshot.xml b/man/systemd.snapshot.xml index db3343af67..b432682a48 100644 --- a/man/systemd.snapshot.xml +++ b/man/systemd.snapshot.xml @@ -44,7 +44,7 @@ systemd.snapshot - systemd snapshot units + Snapshot unit configuration diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index d3762cd63d..5ca1c7a7c1 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -44,7 +44,7 @@ systemd.socket - systemd socket configuration files + Socket unit configuration diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index beb8dba210..aaf77f8396 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -44,7 +44,7 @@ systemd.swap - systemd swap configuration files + Swap unit configuration diff --git a/man/systemd.target.xml b/man/systemd.target.xml index 61eeb7fd8a..d1f4d22674 100644 --- a/man/systemd.target.xml +++ b/man/systemd.target.xml @@ -44,7 +44,7 @@ systemd.target - systemd target configuration files + Target unit configuration diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml index 0b204353f4..6fc26a5536 100644 --- a/man/systemd.timer.xml +++ b/man/systemd.timer.xml @@ -44,7 +44,7 @@ systemd.timer - systemd timer configuration files + Timer unit configuration diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 4a2e9c3bf9..286862006a 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -44,7 +44,7 @@ systemd.unit - systemd unit configuration files + Unit configuration diff --git a/man/systemd.xml b/man/systemd.xml index a184b1a401..c598a896f0 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -45,7 +45,7 @@ systemd init - systemd System and Service Manager + systemd system and service manager diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml index 8617721664..e23a980232 100644 --- a/man/vconsole.conf.xml +++ b/man/vconsole.conf.xml @@ -44,7 +44,7 @@ vconsole.conf - configuration file for the virtual console + Configuration file for the virtual console -- cgit v1.2.3-54-g00ecf From c53158818d8cdaf46b3f1b5299b9bda118a1043f Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Tue, 4 Sep 2012 19:24:16 +0200 Subject: man: fix a bunch of typos in docs https://bugs.freedesktop.org/show_bug.cgi?id=54501 --- man/bootup.xml | 2 +- man/crypttab.xml | 8 ++++---- man/daemon.xml | 10 +++++----- man/kernel-command-line.xml | 2 +- man/locale.conf.xml | 2 +- man/pam_systemd.xml | 4 ++-- man/sd_journal_print.xml | 2 +- man/sd_seat_get_active.xml | 2 +- man/systemctl.xml | 6 +++--- man/systemd.device.xml | 2 +- man/systemd.exec.xml | 6 +++--- man/systemd.service.xml | 12 ++++++------ man/systemd.socket.xml | 8 ++++---- man/systemd.unit.xml | 2 +- src/core/dbus-unit.c | 2 +- src/core/transaction.c | 2 +- src/core/unit.c | 2 +- src/core/unit.h | 2 +- src/journal/journal-file.c | 2 +- src/journal/lookup3.c | 2 +- src/journal/mmap-cache.c | 2 +- src/libudev/libudev-device.c | 2 +- src/udev/udevd.c | 2 +- test/test-functions | 2 +- 24 files changed, 44 insertions(+), 44 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/bootup.xml b/man/bootup.xml index ae70c953f5..4cc4bafab7 100644 --- a/man/bootup.xml +++ b/man/bootup.xml @@ -111,7 +111,7 @@ target units are available, as listed on systemd.special7. - The follow chart is a structural overview of + The following chart is a structural overview of these well-known units and their position in the boot-up logic. The arrows describe which units are pulled in and ordered before which other units. Units diff --git a/man/crypttab.xml b/man/crypttab.xml index 8711272a87..2a839944dc 100644 --- a/man/crypttab.xml +++ b/man/crypttab.xml @@ -175,7 +175,7 @@ verify - If the the encryption + If the encryption password is read from console, it has to be entered twice (to prevent typos). @@ -217,9 +217,9 @@ timeout= Specify the timeout - for querying for a password. If not - unit is specified in - seconds. Supported units are s, ms, + for querying for a password. If no + unit is specified seconds is used. + Supported units are s, ms, us, min, h, d. diff --git a/man/daemon.xml b/man/daemon.xml index 9d43353f90..e3c038e46a 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -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 @@ -462,7 +462,7 @@ 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 diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index cfc9b8599e..27f0d4036f 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -93,7 +93,7 @@ Parameters understood by the system and service manager - to control system behaviour. For details see + to control system behavior. For details see systemd1. diff --git a/man/locale.conf.xml b/man/locale.conf.xml index 2cbcdc66de..06c0af0bf7 100644 --- a/man/locale.conf.xml +++ b/man/locale.conf.xml @@ -117,7 +117,7 @@ LC_TELEPHONE=, LC_MEASUREMENT=, LC_IDENTIFICATION=. Note that - LC_ALL may not be be configured in + LC_ALL may not be configured in this file. For details about the meaning and semantics of these settings, refer to locale7. diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml index f2c1ab8ca6..27edea7779 100644 --- a/man/pam_systemd.xml +++ b/man/pam_systemd.xml @@ -157,7 +157,7 @@ listed in this argument will not be subject to the effect of . Note - that that this option takes precedence + that this option takes precedence over , and hence whatever is listed for @@ -272,7 +272,7 @@ in again, the directory contents will have been lost in between, but applications should not rely on this - behaviour and must be able to deal with + behavior and must be able to deal with stale files. To store session-private data in this directory the user should include the value of $XDG_SESSION_ID diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml index c03762ac2c..41414bbc09 100644 --- a/man/sd_journal_print.xml +++ b/man/sd_journal_print.xml @@ -123,7 +123,7 @@ object of type va_list (see stdarg3 for more information) instead of the format string. It - is otherwise equivalent in behaviour. + is otherwise equivalent in behavior. sd_journal_send() may be used to submit structured log entries to the system diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml index 801c16a4bb..778f9aeaf9 100644 --- a/man/sd_seat_get_active.xml +++ b/man/sd_seat_get_active.xml @@ -93,7 +93,7 @@ a seat, if there is any. Returns the session identifier and the user identifier of the Unix user the session is belonging to. Either the session or the - user identifier parameter can be be passed NULL, in + user identifier parameter can be passed NULL, in case only one of the parameters shall be queried. The returned string needs to be freed with the libc free3 diff --git a/man/systemctl.xml b/man/systemctl.xml index c5fae825aa..fedc588766 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -1107,7 +1107,7 @@ mounted read-only, immediately followed by the system halt. If is specified - twice the the operation is immediately + twice the operation is immediately executed without terminating any processes or unmounting any file systems. This may result in data @@ -1128,7 +1128,7 @@ unmounted or mounted read-only, immediately followed by the powering off. If is - specified twice the the operation is + specified twice the operation is immediately executed without terminating any processes or unmounting any file systems. This may @@ -1149,7 +1149,7 @@ unmounted or mounted read-only, immediately followed by the reboot. If is specified - twice the the operation is immediately + twice the operation is immediately executed without terminating any processes or unmounting any file systems. This may result in data diff --git a/man/systemd.device.xml b/man/systemd.device.xml index 7c05ab035b..c360319d23 100644 --- a/man/systemd.device.xml +++ b/man/systemd.device.xml @@ -131,7 +131,7 @@ to 1 the device will be considered plugged the moment it shows up in the udev tree. This property has no - influence on the behaviour when a + influence on the behavior when a device disappears from the udev tree. This option is useful to support devices that initially show up in an diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index cf6ab1778e..7ab9b5c1ed 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -471,7 +471,7 @@ TTYVTDisallocate= - If the the terminal + If the terminal device specified with TTYPath= is a virtual console terminal try to @@ -806,7 +806,7 @@ Set a specific control group attribute for executed - processes, and (if needed) add the the + processes, and (if needed) add the executed processes to a cgroup in the hierarchy of the controller the attribute belongs to. Takes two @@ -1055,7 +1055,7 @@ UtmpIdentifier= - Takes a a four + Takes a four character identifier string for an utmp/wtmp entry for this service. This should only be set for services such diff --git a/man/systemd.service.xml b/man/systemd.service.xml index c547948c6e..339dea9aa5 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -160,7 +160,7 @@ complete and all communication channels set up. The child continues to run as the main daemon - process. This is the behaviour of + process. This is the behavior of traditional UNIX daemons. If this setting is used, it is recommended to also use the @@ -171,7 +171,7 @@ soon as the parent process exits. - Behaviour of + Behavior of is similar to , however it is expected that the process has to @@ -180,7 +180,7 @@ is particularly useful for this type of service. - Behaviour of + Behavior of is similar to , however it is expected that the daemon acquires a @@ -197,7 +197,7 @@ BusName= is specified. - Behaviour of + Behavior of is similar to , however it is expected that the daemon sends a @@ -216,7 +216,7 @@ not set, it will be implicitly set to . - Behaviour of + Behavior of is very similar to , however actual execution of a the service @@ -599,7 +599,7 @@ SIGTERM and SIGPIPE. Exit status definitions can either be numeric exit codes or termination signal names, and - are are separated by spaces. Example: + are separated by spaces. Example: "SuccessExitStatus=1 2 8 SIGKILL", ensures that exit codes 1, 2, 8 and the termination diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 8a12e25cf4..6cf6c79e11 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -217,7 +217,7 @@ Specifies a file system FIFO to listen on. This expects an absolute file system path as - argument. Behaviour otherwise is very + argument. Behavior otherwise is very similar to the ListenDatagram= directive above. @@ -228,7 +228,7 @@ Specifies a special file in the file system to listen on. This expects an absolute file - system path as argument. Behaviour + system path as argument. Behavior otherwise is very similar to the ListenFIFO= directive above. Use this to open @@ -248,7 +248,7 @@ or kobject-uevent) as argument, optionally suffixed by a whitespace followed by a multicast - group integer. Behaviour otherwise is + group integer. Behavior otherwise is very similar to the ListenDatagram= directive above. @@ -259,7 +259,7 @@ Specifies a POSIX message queue name to listen on. This expects a valid message queue name - (i.e. beginning with /). Behaviour + (i.e. beginning with /). Behavior otherwise is very similar to the ListenFIFO= directive above. On Linux message diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 00f6066717..e0aadf4cd3 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -440,7 +440,7 @@ Configures requirement dependencies, very similar in style to Requires=, however - in addition to this behaviour it also + in addition to this behavior it also declares that this unit is stopped when any of the units listed suddenly disappears. Units can suddenly, diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index ad817d7ee8..fdfa5ee200 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -682,7 +682,7 @@ void bus_unit_send_change_signal(Unit *u) { /* Send a properties changed signal. First for the * specific type, then for the generic unit. The * clients may rely on this order to get atomic - * behaviour if needed. */ + * behavior if needed. */ if (UNIT_VTABLE(u)->bus_invalidating_properties) { diff --git a/src/core/transaction.c b/src/core/transaction.c index 1f8d803aeb..4bce942012 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -392,7 +392,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi j->marker = from ? from : j; j->generation = generation; - /* We assume that the the dependencies are bidirectional, and + /* We assume that the dependencies are bidirectional, and * hence can ignore UNIT_AFTER */ SET_FOREACH(u, j->unit->dependencies[UNIT_BEFORE], i) { Job *o; diff --git a/src/core/unit.c b/src/core/unit.c index c9cd9ee2a0..3950c43f5e 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -1327,7 +1327,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su /* Note that this is called for all low-level state changes, * even if they might map to the same high-level * UnitActiveState! That means that ns == os is OK an expected - * behaviour here. For example: if a mount point is remounted + * behavior here. For example: if a mount point is remounted * this function will be called too! */ if (u->manager->n_reloading <= 0) { diff --git a/src/core/unit.h b/src/core/unit.h index 89bd61c2d8..5b4dda4cb0 100644 --- a/src/core/unit.h +++ b/src/core/unit.h @@ -285,7 +285,7 @@ struct UnitVTable { * UNIT_STUB if no configuration could be found. */ int (*load)(Unit *u); - /* If a a lot of units got created via enumerate(), this is + /* If a lot of units got created via enumerate(), this is * where to actually set the state and call unit_notify(). */ int (*coldplug)(Unit *u); diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index 8dc0a3a669..e778e1c67c 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -1051,7 +1051,7 @@ void journal_file_post_change(JournalFile *f) { __sync_synchronize(); if (ftruncate(f->fd, f->last_stat.st_size) < 0) - log_error("Failed to to truncate file to its own size: %m"); + log_error("Failed to truncate file to its own size: %m"); } int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const struct iovec iovec[], unsigned n_iovec, uint64_t *seqnum, Object **ret, uint64_t *offset) { diff --git a/src/journal/lookup3.c b/src/journal/lookup3.c index 31eac8c543..ee9a1834cf 100644 --- a/src/journal/lookup3.c +++ b/src/journal/lookup3.c @@ -14,7 +14,7 @@ if SELF_TEST is defined. You can use this free for any purpose. It's in the public domain. It has no warranty. You probably want to use hashlittle(). hashlittle() and hashbig() -hash byte arrays. hashlittle() is is faster than hashbig() on +hash byte arrays. hashlittle() is faster than hashbig() on little-endian machines. Intel and AMD are little-endian machines. On second thought, you probably want hashlittle2(), which is identical to hashlittle() except it returns two 32-bit hashes for the price of one. diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c index 2b45e375c5..7d6c6c22ba 100644 --- a/src/journal/mmap-cache.c +++ b/src/journal/mmap-cache.c @@ -392,7 +392,7 @@ static int mmap_cache_put( if (st) { /* Memory maps that are larger then the files - underneath have undefined behaviour. Hence, clamp + underneath have undefined behavior. Hence, clamp things to the file size if we know it */ if (woffset >= (uint64_t) st->st_size) diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c index 1bef70962c..972ace5d39 100644 --- a/src/libudev/libudev-device.c +++ b/src/libudev/libudev-device.c @@ -1124,7 +1124,7 @@ _public_ const char *udev_device_get_sysname(struct udev_device *udev_device) * * Get the instance number of the device. * - * Returns: the trailing number string of of the device name + * Returns: the trailing number string of the device name **/ _public_ const char *udev_device_get_sysnum(struct udev_device *udev_device) { diff --git a/src/udev/udevd.c b/src/udev/udevd.c index b4fc624db3..35263ff135 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1177,7 +1177,7 @@ int main(int argc, char *argv[]) } if (systemd_fds(udev, &fd_ctrl, &fd_netlink) >= 0) { - /* get control and netlink socket from from systemd */ + /* get control and netlink socket from systemd */ udev_ctrl = udev_ctrl_new_from_fd(udev, fd_ctrl); if (udev_ctrl == NULL) { log_error("error taking over udev control socket"); diff --git a/test/test-functions b/test/test-functions index c355423192..0587cd4feb 100644 --- a/test/test-functions +++ b/test/test-functions @@ -620,7 +620,7 @@ for_each_kmod_dep() { # $1 = search only in subdirectory of /kernel/$1 # $2 = function to call with module name to filter. # This function will be passed the full path to the module to test. -# The behaviour of this function can vary depending on whether $hostonly is set. +# The behavior of this function can vary depending on whether $hostonly is set. # If it is, we will only look at modules that are already in memory. # If it is not, we will look at all kernel modules # This function returns the full filenames of modules that match $1 -- cgit v1.2.3-54-g00ecf From 16dad32e437fdf2ffca03cc60a083d84bd31886f Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Mon, 15 Oct 2012 13:59:12 -0500 Subject: Reword sentences that contain psuedo-English "resp." As you likely know, Arch Linux is in the process of moving to systemd. So I was reading through the various systemd docs and quickly became baffled by this new abbreviation "resp.", which I've never seen before in my English-mother-tongue life. Some quick Googling turned up a reference: I guess it's a literal translation of the German "Beziehungsweise", but English doesn't work the same way. The word "respectively" is used exclusively to provide an ordering connection between two lists. E.g. "the prefixes k, M, and G refer to kilo-, mega-, and giga-, respectively." It is also never abbreviated to "resp." So the sentence "Sets the default output resp. error output for all services and sockets" makes no sense to a natural English speaker. This patch removes all instances of "resp." in the man pages and replaces them with sentences which are much more clear and, hopefully, grammatically valid. In almost all instances, it was simply replacing "resp." with "or," which the original author (Lennart?) could probably just do in the future. The only other instances of "resp." are in the src/ subtree, which I don't feel privileged to correct. Signed-off-by: Andrew Eikum --- man/daemon.xml | 2 +- man/journalctl.xml | 14 +++---- man/os-release.xml | 4 +- man/sd-daemon.xml | 2 +- man/sd-readahead.xml | 2 +- man/sd_booted.xml | 2 +- man/sd_is_fifo.xml | 2 +- man/sd_journal_next.xml | 4 +- man/sd_listen_fds.xml | 2 +- man/sd_notify.xml | 2 +- man/sd_readahead.xml | 2 +- man/systemd-ask-password-console.service.xml | 4 +- man/systemd-cat.xml | 2 +- man/systemd-cgtop.xml | 12 +++--- man/systemd-inhibit.xml | 5 ++- man/systemd.exec.xml | 18 ++++----- man/systemd.journal-fields.xml | 4 +- man/systemd.kill.xml | 2 +- man/systemd.service.xml | 4 +- man/systemd.socket.xml | 22 +++++----- man/systemd.swap.xml | 6 +-- man/systemd.unit.xml | 20 +++++----- man/systemd.xml | 60 ++++++++++++++-------------- 23 files changed, 100 insertions(+), 97 deletions(-) (limited to 'man/daemon.xml') diff --git a/man/daemon.xml b/man/daemon.xml index e3c038e46a..197138e51d 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -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 diff --git a/man/journalctl.xml b/man/journalctl.xml index 3786fdf514..0bbcee33ab 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -275,9 +275,9 @@ Start showing entries - newer or of the specified date, - resp. older or of the specified - date. Date specifications should be of + on or newer than the specified date, + or on or older than the specified + date, respectively. Date specifications should be of the format "2012-10-30 18:17:16". If the time part is omitted, 00:00:00 is assumed. If only the seconds component @@ -290,14 +290,14 @@ tomorrow are understood, which refer to 00:00:00 of the day before the current day, the - current day, resp the day after the - current day. now + current day, or the day after the + current day, respectively. now refers to the current time. Finally, relative times may be specified, prefixed with - or +, referring to - times before resp. after the current - time. + times before or after the current + time, respectively. diff --git a/man/os-release.xml b/man/os-release.xml index 5e34a884bb..98320efe31 100644 --- a/man/os-release.xml +++ b/man/os-release.xml @@ -279,8 +279,8 @@ URLs are intended to be exposed in "About this system" UIs behind links with captions such as "About this - Operating System", "Obtain Support" - resp. "Report a Bug". The values should + Operating System", "Obtain Support", + and "Report a Bug". The values should be in RFC3986 format, and should be diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml index 1e1734adf6..a3bf662fe9 100644 --- a/man/sd-daemon.xml +++ b/man/sd-daemon.xml @@ -139,7 +139,7 @@ check the liberally licensed reference implementation sources: - resp. + and These APIs are implemented in the reference implementation's sd-daemon.c and diff --git a/man/sd-readahead.xml b/man/sd-readahead.xml index 484e1273b2..cebaa5da2b 100644 --- a/man/sd-readahead.xml +++ b/man/sd-readahead.xml @@ -87,7 +87,7 @@ check the liberally licensed reference implementation sources: - resp. + and These APIs are implemented in the reference implementation's drop-in diff --git a/man/sd_booted.xml b/man/sd_booted.xml index 3567d585ae..34f2cbfbc8 100644 --- a/man/sd_booted.xml +++ b/man/sd_booted.xml @@ -94,7 +94,7 @@ For details about the algorithm check the liberally licensed reference implementation sources: - resp. sd_booted() is implemented diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml index a98122b1b0..27e9a0de8f 100644 --- a/man/sd_is_fifo.xml +++ b/man/sd_is_fifo.xml @@ -181,7 +181,7 @@ For details about the algorithms check the liberally licensed reference implementation sources: - resp. sd_is_fifo() and the diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml index 95429fa6ff..58e7cec6f3 100644 --- a/man/sd_journal_next.xml +++ b/man/sd_journal_next.xml @@ -140,8 +140,8 @@ The four calls return the number of entries advanced/set back on success or a negative errno-style - error code. When the end (resp. beginning) of the journal - is reached a number smaller than requested is + error code. When the end or beginning of the journal + is reached, a number smaller than requested is returned. More specifically, if sd_journal_next() or sd_journal_previous() reach the diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml index 649b1995a1..b891b6b039 100644 --- a/man/sd_listen_fds.xml +++ b/man/sd_listen_fds.xml @@ -142,7 +142,7 @@ For details about the algorithm check the liberally licensed reference implementation sources: - resp. sd_listen_fds() is diff --git a/man/sd_notify.xml b/man/sd_notify.xml index 346ec8f90b..5f86e86fec 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -228,7 +228,7 @@ For details about the algorithms check the liberally licensed reference implementation sources: - resp. sd_notify() and diff --git a/man/sd_readahead.xml b/man/sd_readahead.xml index ff7b355741..a1fc6f178f 100644 --- a/man/sd_readahead.xml +++ b/man/sd_readahead.xml @@ -130,7 +130,7 @@ For details about the algorithm check the liberally licensed reference implementation sources: - resp. sd_readahead() is diff --git a/man/systemd-ask-password-console.service.xml b/man/systemd-ask-password-console.service.xml index 6ca94360ac..6c87feb179 100644 --- a/man/systemd-ask-password-console.service.xml +++ b/man/systemd-ask-password-console.service.xml @@ -79,8 +79,8 @@ Note that these services invoke systemd-tty-ask-password-agent1 - with the --watch --console - resp. --watch --wall command line + with either the --watch --console + or --watch --wall command line parameters. diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml index 54e28726cb..cac275b453 100644 --- a/man/systemd-cat.xml +++ b/man/systemd-cat.xml @@ -120,7 +120,7 @@ warning, notice, info, - debug, resp. a + debug, or a value between 0 and 7 (corresponding to the same named levels). These priority values are the same as diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml index 112e5fff87..7a34512b21 100644 --- a/man/systemd-cgtop.xml +++ b/man/systemd-cgtop.xml @@ -238,19 +238,19 @@ m i - Change ordering of control groups + Sort the control groups by path, number of tasks, CPU load, - memory usage resp. IO - load. + memory usage, or IO + load, respectively. + - - Increase, - resp. decrease refresh - delay. + Increase + or decrease refresh + delay, respectively. diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml index 1218836cb2..5f26c96546 100644 --- a/man/systemd-inhibit.xml +++ b/man/systemd-inhibit.xml @@ -114,9 +114,10 @@ for inhibiting reboot/power-off/halt/kexec, suspending/hibernating, the automatic - idle detection, resp. the low-level + idle detection, or the low-level handling of the power/sleep key and - the lid switch. If omitted defaults to + the lid switch, respectively. If omitted, + defaults to idle:sleep:shutdown. diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 7ab9b5c1ed..3491d877d1 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -75,7 +75,7 @@ for more information on the specific unit configuration files. The execution specific configuration options are configured in the [Service], - [Socket], [Mount] resp. [Swap] section, depending on the unit + [Socket], [Mount], or [Swap] sections, depending on the unit type. @@ -117,10 +117,10 @@ Group= Sets the Unix user - resp. group the processes are executed - as. Takes a single user resp. group + or group that the processes are executed + as, respectively. Takes a single user or group name or ID as argument. If no group is - set the default group of the user is + set, the default group of the user is chosen. @@ -868,8 +868,8 @@ the value is suffixed with K, M, G or T the specified memory size is parsed as Kilobytes, Megabytes, Gigabytes, - resp. Terabytes (to the base - 1024). This controls the + or Terabytes (to the base + 1024), respectively. This controls the memory.limit_in_bytes and memory.soft_limit_in_bytes @@ -889,9 +889,9 @@ path (such as /dev/null) followed by a combination of r, w, m - to control reading, writing resp. + to control reading, writing, or creating of the specific device node - by the unit. This controls the + by the unit, respectively. This controls the devices.allow and devices.deny @@ -948,7 +948,7 @@ If the bandwidth is suffixed with K, M, G, or T the specified bandwidth is parsed as Kilobytes, Megabytes, - Gigabytes, resp. Terabytes (Example: + Gigabytes, or Terabytes, respectively (Example: "/dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0 5M"). This controls the blkio.read_bps_device diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml index d1cb40bb12..e212c811fd 100644 --- a/man/systemd.journal-fields.xml +++ b/man/systemd.journal-fields.xml @@ -298,8 +298,8 @@ journal protocol, for the those read from a services' standard output or error - output, and for those read - from the kernel, resp. + output, or for those read + from the kernel, respectively. diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml index 3300534040..3fff2f57e6 100644 --- a/man/systemd.kill.xml +++ b/man/systemd.kill.xml @@ -75,7 +75,7 @@ for more information on the specific unit configuration files. The execution specific configuration options are configured in the [Service], - [Socket], [Mount] resp. [Swap] section, depending on the unit + [Socket], [Mount], or [Swap] section, depending on the unit type. diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 339dea9aa5..11f6006636 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -372,9 +372,9 @@ ExecStartPre= ExecStartPost= Additional commands - that are executed before (resp. after) + that are executed before or after the command in - ExecStart=. Multiple + ExecStart=, respectively. Multiple command lines may be concatenated in a single directive, by separating them by semicolons (these semicolons must diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 7885b0748a..9db39b1de9 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -150,9 +150,9 @@ ListenSequentialPacket= Specifies an address to listen on for a stream - (SOCK_STREAM), datagram (SOCK_DGRAM) - resp. sequential packet - (SOCK_SEQPACKET) socket. The address + (SOCK_STREAM), datagram (SOCK_DGRAM), + or sequential packet + (SOCK_SEQPACKET) socket, respectively. The address can be written in various formats: If the address starts with a @@ -434,9 +434,9 @@ SendBuffer= Takes an integer argument controlling the receive - resp. send buffer sizes of this - socket. This controls the SO_RCVBUF - resp. SO_SNDBUF socket options (see + or send buffer sizes of this + socket, respectively. This controls the SO_RCVBUF + and SO_SNDBUF socket options (see socket7 for details.). @@ -499,7 +499,7 @@ MessageQueueMessageSize= These two settings take integer values and control the - mq_maxmsg resp. mq_msgsize field when + mq_maxmsg field or the mq_msgsize field, respectively, when creating the message queue. Note that either none or both of these variables need to be set. See @@ -581,9 +581,9 @@ ExecStartPost= Takes one or more command lines, which are executed - before (resp. after) the listening + before or after the listening sockets/FIFOs are created and - bound. The first token of the command + bound, respectively. The first token of the command line must be an absolute file name, then followed by arguments for the process. Multiple command lines may be @@ -597,9 +597,9 @@ ExecStopPre= ExecStopPost= Additional commands - that are executed before (resp. after) + that are executed before or after the listening sockets/FIFOs are closed - and removed. Multiple command lines + and removed, respectively. Multiple command lines may be specified following the same scheme as used for ExecStartPre= of diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index 5eb008dfcf..a932143d43 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -78,7 +78,7 @@ terminated. Swap units must be named after the devices - (resp. files) they control. Example: the swap device + or files they control. Example: the swap device /dev/sda5 must be configured in a unit file dev-sda5.swap. For details about the escaping logic used to convert a @@ -86,8 +86,8 @@ systemd.unit5. All swap units automatically get the appropriate - dependencies on the devices (resp. on the mount points - of the files) they are activated from. + dependencies on the devices or on the mount points + of the files they are activated from. Swap units with DefaultDependencies= enabled diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 55569681cf..afad56c5b2 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -77,8 +77,8 @@ This man pages lists the common configuration options of all the unit types. These options need to - be configured in the [Unit] resp. [Install] - section of the unit files. + be configured in the [Unit] or [Install] + sections of the unit files. In addition to the generic [Unit] and [Install] sections described here, each unit should have a @@ -418,7 +418,7 @@ Similar to Requires= - resp. RequiresOverridable=. However, + and RequiresOverridable=, respectively. However, if a unit listed here is not started already it will not be started and the transaction fails @@ -566,7 +566,7 @@ Before=. If two units have no ordering dependencies between them they are shut down - resp. started up simultaneously, and + or started up simultaneously, and no ordering takes place. @@ -672,13 +672,13 @@ Takes a boolean argument. If this unit can only be activated - (resp. deactivated) indirectly. In + or deactivated indirectly. In this case explicit start-up - (resp. termination) requested by the + or termination requested by the user is denied, however if it is - started (resp. stopped) as a + started or stopped as a dependency of another unit, start-up - (resp. termination) will succeed. This + or termination will succeed. This is mostly a safety feature to ensure that the user does not accidentally activate units that are not intended @@ -1023,8 +1023,8 @@ Installs a symlink in the .wants/ - resp. .requires/ - subdirectory for a unit. This has the + or .requires/ + subdirectory for a unit, respectively. This has the effect that when the listed unit name is activated the unit listing it is activated diff --git a/man/systemd.xml b/man/systemd.xml index 01833f66f2..f14e3eb9ae 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -144,11 +144,13 @@ - Tell systemd to run a - system instance (resp. user - instance), even if the process ID is - not 1 (resp. is 1), i.e. systemd is - not (resp. is) run as init process. + For , + tell systemd to run a + system instance, even if the process ID is + not 1, i.e. systemd is not run as init process. + does the opposite, + running a user instance even if the process + ID is 1. Normally it should not be necessary to pass these options, as systemd automatically detects the mode it is @@ -251,11 +253,11 @@ Sets the default - output resp. error output for all - services and sockets, i.e. controls + output or error output for all + services and sockets, respectively. That is, controls the default for - resp. + and (see systemd.exec5 for details). Takes one of @@ -495,12 +497,12 @@ Specification. Systems which invoke systemd in a container - resp. initrd environment should implement the + or initrd environment should implement the Container - Interface resp. or initrd - Interface specifications. + Interface specifications, respectively. @@ -825,11 +827,11 @@ Sets the log level to debug - (resp. info on + (or info on SIGRTMIN+23), as controlled via systemd.log_level=debug - (resp. systemd.log_level=info + (or systemd.log_level=info on SIGRTMIN+23) on the kernel command line. @@ -843,19 +845,19 @@ Sets the log level to journal-or-kmsg - (resp. console on - SIGRTMIN+27; - resp. kmsg on - SIGRTMIN+28; - resp. syslog-or-kmsg + (or console on + SIGRTMIN+27, + kmsg on + SIGRTMIN+28, + or syslog-or-kmsg on SIGRTMIN+29), as controlled via systemd.log_target=journal-or-kmsg - (resp. systemd.log_target=console - on SIGRTMIN+27; - resp. systemd.log_target=kmsg - on SIGRTMIN+28; - resp + (or systemd.log_target=console + on SIGRTMIN+27, + systemd.log_target=kmsg + on SIGRTMIN+28, + or systemd.log_target=syslog-or-kmsg on SIGRTMIN+29) on the kernel command @@ -1073,12 +1075,12 @@ systemd.default_standard_output= systemd.default_standard_error= Controls default - standard output/error output for + standard output and error output for services, with the same effect as the - resp. + and command line arguments described - above. + above, respectively. @@ -1143,12 +1145,12 @@ 5 Boot into the - specified legacy SysV runlevel. This - is equivalent to + specified legacy SysV runlevel. These + are equivalent to systemd.unit=runlevel2.target, systemd.unit=runlevel3.target, systemd.unit=runlevel4.target, - resp. systemd.unit=runlevel5.target + and systemd.unit=runlevel5.target, respectively, and provided for compatibility reasons and to be easier to type. -- cgit v1.2.3-54-g00ecf