From fe540c5cc92427f2f5dcdb3a06fe3bc642dd91a2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 26 Aug 2016 00:26:55 -0400 Subject: install README files --- discard.mk | 22 ------------------ src/grp-journal/.gitignore | 1 + src/grp-journal/Makefile | 11 +++++++++ src/grp-journal/README.in | 26 +++++++++++++++++++++ src/grp-journal/var-log/.gitignore | 1 - src/grp-journal/var-log/README.in | 26 --------------------- .../grp-utils/systemd-sysv-generator/.gitignore | 1 + .../grp-utils/systemd-sysv-generator/Makefile | 6 +++++ .../grp-utils/systemd-sysv-generator/README.in | 27 ++++++++++++++++++++++ src/grp-system/sysvinit/.gitignore | 1 - src/grp-system/sysvinit/README.in | 27 ---------------------- 11 files changed, 72 insertions(+), 77 deletions(-) create mode 100644 src/grp-journal/README.in delete mode 100644 src/grp-journal/var-log/.gitignore delete mode 100644 src/grp-journal/var-log/README.in create mode 100644 src/grp-system/grp-utils/systemd-sysv-generator/.gitignore create mode 100644 src/grp-system/grp-utils/systemd-sysv-generator/README.in delete mode 100644 src/grp-system/sysvinit/.gitignore delete mode 100644 src/grp-system/sysvinit/README.in diff --git a/discard.mk b/discard.mk index 42759a0d3b..b692c27b94 100644 --- a/discard.mk +++ b/discard.mk @@ -917,28 +917,6 @@ EXTRA_DIST += \ man/custom-man.xsl # ------------------------------------------------------------------------------ -ifneq ($(HAVE_SYSV_COMPAT),) -sysvinit_DATA = \ - docs/sysvinit/README - -varlog_DATA = \ - docs/var-log/README - -$(outdir)/README: docs/sysvinit/README.in - $(SED_PROCESS) - -$(outdir)/README: docs/var-log/README.in - $(SED_PROCESS) - -CLEANFILES += \ - docs/sysvinit/README \ - docs/var-log/README -endif # HAVE_SYSV_COMPAT - -EXTRA_DIST += \ - docs/sysvinit/README.in \ - docs/var-log/README.in - SOCKETS_TARGET_WANTS += \ systemd-initctl.socket diff --git a/src/grp-journal/.gitignore b/src/grp-journal/.gitignore index 04d5852547..c9bd45a7be 100644 --- a/src/grp-journal/.gitignore +++ b/src/grp-journal/.gitignore @@ -2,3 +2,4 @@ /libsystemd-journal.pc /audit_type-list.txt /audit_type-*-name.* +/README diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile index f1f3453d33..25e34bda4b 100644 --- a/src/grp-journal/Makefile +++ b/src/grp-journal/Makefile @@ -174,4 +174,15 @@ nested.subdirs += journalctl systemd-journald libjournal-core nested.subdirs += systemd-cat #nested.subdirs += grp-remote +ifneq ($(HAVE_SYSV_COMPAT),) +varlog_DATA = \ + docs/var-log/README + +CLEANFILES += \ + docs/var-log/README +endif # HAVE_SYSV_COMPAT + +EXTRA_DIST += \ + docs/var-log/README.in + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-journal/README.in b/src/grp-journal/README.in new file mode 100644 index 0000000000..2e64fb196a --- /dev/null +++ b/src/grp-journal/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/src/grp-journal/var-log/.gitignore b/src/grp-journal/var-log/.gitignore deleted file mode 100644 index c3fea7424f..0000000000 --- a/src/grp-journal/var-log/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/README diff --git a/src/grp-journal/var-log/README.in b/src/grp-journal/var-log/README.in deleted file mode 100644 index 2e64fb196a..0000000000 --- a/src/grp-journal/var-log/README.in +++ /dev/null @@ -1,26 +0,0 @@ -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/src/grp-system/grp-utils/systemd-sysv-generator/.gitignore b/src/grp-system/grp-utils/systemd-sysv-generator/.gitignore new file mode 100644 index 0000000000..c3fea7424f --- /dev/null +++ b/src/grp-system/grp-utils/systemd-sysv-generator/.gitignore @@ -0,0 +1 @@ +/README diff --git a/src/grp-system/grp-utils/systemd-sysv-generator/Makefile b/src/grp-system/grp-utils/systemd-sysv-generator/Makefile index 10dd75abc6..dfb065af90 100644 --- a/src/grp-system/grp-utils/systemd-sysv-generator/Makefile +++ b/src/grp-system/grp-utils/systemd-sysv-generator/Makefile @@ -29,4 +29,10 @@ systemd_sysv_generator_SOURCES = \ systemd_sysv_generator_LDADD = \ libcore.la +sysvinit_DATA = \ + docs/sysvinit/README + +EXTRA_DIST += \ + docs/sysvinit/README.in \ + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/grp-utils/systemd-sysv-generator/README.in b/src/grp-system/grp-utils/systemd-sysv-generator/README.in new file mode 100644 index 0000000000..996402d06b --- /dev/null +++ b/src/grp-system/grp-utils/systemd-sysv-generator/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 + http://www.freedesktop.org/wiki/Software/systemd/Incompatibilities diff --git a/src/grp-system/sysvinit/.gitignore b/src/grp-system/sysvinit/.gitignore deleted file mode 100644 index c3fea7424f..0000000000 --- a/src/grp-system/sysvinit/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/README diff --git a/src/grp-system/sysvinit/README.in b/src/grp-system/sysvinit/README.in deleted file mode 100644 index 996402d06b..0000000000 --- a/src/grp-system/sysvinit/README.in +++ /dev/null @@ -1,27 +0,0 @@ -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 - http://www.freedesktop.org/wiki/Software/systemd/Incompatibilities -- cgit v1.2.3-54-g00ecf