diff options
author | Lennart Poettering <lennart@poettering.net> | 2018-03-28 16:58:37 +0200 |
---|---|---|
committer | Filipe Brandenburger <filbranden@google.com> | 2018-03-28 18:38:30 +0200 |
commit | 2d684e65aaacc9f995236843597ddee96ed8aa70 (patch) | |
tree | 3dce8e12b8a3cd7c6b248ef8d9a09e04d1aa91c5 /doc | |
parent | systemctl: refuse to edit masked units (#8602) (diff) | |
download | systemd-2d684e65aaacc9f995236843597ddee96ed8aa70.tar.xz systemd-2d684e65aaacc9f995236843597ddee96ed8aa70.zip |
doc: merge docs/ dir → doc/
It's weird having two subdirs for documentation, let's unify this in
one.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/sysvinit/README.in | 27 | ||||
-rw-r--r-- | doc/sysvinit/meson.build | 26 | ||||
-rw-r--r-- | doc/var-log/README.in | 26 | ||||
-rw-r--r-- | doc/var-log/meson.build | 26 |
4 files changed, 105 insertions, 0 deletions
diff --git a/doc/sysvinit/README.in b/doc/sysvinit/README.in new file mode 100644 index 0000000000..de5d80d902 --- /dev/null +++ b/doc/sysvinit/README.in @@ -0,0 +1,27 @@ +You are looking for the traditional init scripts in @SYSTEM_SYSVINIT_PATH@, +and they are gone? + +Here's an explanation on what's going on: + +You are running a systemd-based OS where traditional init scripts have +been replaced by native systemd services files. Service files provide +very similar functionality to init scripts. To make use of service +files simply invoke "systemctl", which will output a list of all +currently running services (and other units). Use "systemctl +list-unit-files" to get a listing of all known unit files, including +stopped, disabled and masked ones. Use "systemctl start +foobar.service" and "systemctl stop foobar.service" to start or stop a +service, respectively. For further details, please refer to +systemctl(1). + +Note that traditional init scripts continue to function on a systemd +system. An init script @SYSTEM_SYSVINIT_PATH@/foobar is implicitly mapped +into a service unit foobar.service during system initialization. + +Thank you! + +Further reading: + man:systemctl(1) + man:systemd(1) + http://0pointer.de/blog/projects/systemd-for-admins-3.html + https://www.freedesktop.org/wiki/Software/systemd/Incompatibilities diff --git a/doc/sysvinit/meson.build b/doc/sysvinit/meson.build new file mode 100644 index 0000000000..5c1aa4cc20 --- /dev/null +++ b/doc/sysvinit/meson.build @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: LGPL-2.1+ +# +# Copyright 2017 Zbigniew Jędrzejewski-Szmek +# +# systemd 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. +# +# systemd is distributed in the hope that 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 systemd; If not, see <http://www.gnu.org/licenses/>. + +file = configure_file( + input : 'README.in', + output : 'README', + configuration : substs) + +if conf.get('HAVE_SYSV_COMPAT') == 1 + install_data(file, + install_dir : sysvinit_path) +endif diff --git a/doc/var-log/README.in b/doc/var-log/README.in new file mode 100644 index 0000000000..2e64fb196a --- /dev/null +++ b/doc/var-log/README.in @@ -0,0 +1,26 @@ +You are looking for the traditional text log files in @VARLOGDIR@, and +they are gone? + +Here's an explanation on what's going on: + +You are running a systemd-based OS where traditional syslog has been +replaced with the Journal. The journal stores the same (and more) +information as classic syslog. To make use of the journal and access +the collected log data simply invoke "journalctl", which will output +the logs in the identical text-based format the syslog files in +@VARLOGDIR@ used to be. For further details, please refer to +journalctl(1). + +Alternatively, consider installing one of the traditional syslog +implementations available for your distribution, which will generate +the classic log files for you. Syslog implementations such as +syslog-ng or rsyslog may be installed side-by-side with the journal +and will continue to function the way they always did. + +Thank you! + +Further reading: + man:journalctl(1) + man:systemd-journald.service(8) + man:journald.conf(5) + http://0pointer.de/blog/projects/the-journal.html diff --git a/doc/var-log/meson.build b/doc/var-log/meson.build new file mode 100644 index 0000000000..fc14c0405e --- /dev/null +++ b/doc/var-log/meson.build @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: LGPL-2.1+ +# +# Copyright 2017 Zbigniew Jędrzejewski-Szmek +# +# systemd 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. +# +# systemd is distributed in the hope that 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 systemd; If not, see <http://www.gnu.org/licenses/>. + +file = configure_file( + input : 'README.in', + output : 'README', + configuration : substs) + +if conf.get('HAVE_SYSV_COMPAT') == 1 + install_data(file, + install_dir : varlogdir) +endif |