diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-02-29 23:36:23 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-29 23:36:23 +0900 |
| commit | 522f51e8a09fdd86b9a398382617f2e7da1e1a28 (patch) | |
| tree | eedf6e679330213049223b9fd78b59fde22d524d | |
| parent | aeac9dd6475d67a40b61e92395f6c793534a9d59 (diff) | |
| parent | 5926ea0a6860095eaa83403417cbbf345db864f6 (diff) | |
| download | systemd-522f51e8a09fdd86b9a398382617f2e7da1e1a28.tar.gz | |
Merge pull request #14979 from keszybz/enable-pstore-by-default
Enable pstore by default
| -rw-r--r-- | man/rules/meson.build | 2 | ||||
| -rw-r--r-- | man/systemd-pstore.service.xml (renamed from man/systemd-pstore.xml) | 16 | ||||
| -rw-r--r-- | presets/90-systemd.preset | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/man/rules/meson.build b/man/rules/meson.build index 5fe6df6272..6b08add2bb 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -772,7 +772,7 @@ manpages = [ ['systemd-nspawn', '1', [], ''], ['systemd-path', '1', [], ''], ['systemd-portabled.service', '8', ['systemd-portabled'], 'ENABLE_PORTABLED'], - ['systemd-pstore', '8', ['systemd-pstore.service'], 'ENABLE_PSTORE'], + ['systemd-pstore.service', '8', ['systemd-pstore'], 'ENABLE_PSTORE'], ['systemd-quotacheck.service', '8', ['systemd-quotacheck'], diff --git a/man/systemd-pstore.xml b/man/systemd-pstore.service.xml index 11d66b8b01..47916da521 100644 --- a/man/systemd-pstore.xml +++ b/man/systemd-pstore.service.xml @@ -7,19 +7,19 @@ xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> - <title>systemd-pstore</title> + <title>systemd-pstore.service</title> <productname>systemd</productname> </refentryinfo> <refmeta> - <refentrytitle>systemd-pstore</refentrytitle> + <refentrytitle>systemd-pstore.service</refentrytitle> <manvolnum>8</manvolnum> </refmeta> <refnamediv> - <refname>systemd-pstore</refname> <refname>systemd-pstore.service</refname> - <refpurpose>Tool to archive contents of the persistent storage filesystem</refpurpose> + <refname>systemd-pstore</refname> + <refpurpose>A service to archive contents of pstore</refpurpose> </refnamediv> <refsynopsisdiv> @@ -49,8 +49,8 @@ <para>The pstore service is independent of the kdump service. In cloud environments specifically, host and guest filesystems are on remote filesystems (eg. iSCSI - or NFS), thus kdump relies [implicitly and/or explicitly] upon proper operation - of networking software *and* hardware *and* infrastructure. Thus it may not be + or NFS), thus kdump relies (implicitly and/or explicitly) upon proper operation + of networking software *and* hardware *and* infrastructure. Thus it may not be possible to capture a kernel coredump to a file since writes over the network may not be possible.</para> @@ -59,9 +59,9 @@ debugging.</para> <para>The <command>systemd-pstore</command> executable does the actual work. Upon starting, - the <filename>pstore.conf</filename> is read to obtain options, then the /sys/fs/pstore + the <filename>pstore.conf</filename> file is read and the <filename>/sys/fs/pstore</filename> directory contents are processed according to the options. Pstore files are written to the - journal, and optionally saved into /var/lib/systemd/pstore.</para> + journal, and optionally saved into <filename>/var/lib/systemd/pstore</filename>.</para> </refsect1> <refsect1> diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset index 4009cbb96e..dc9d02f0b9 100644 --- a/presets/90-systemd.preset +++ b/presets/90-systemd.preset @@ -36,6 +36,8 @@ disable systemd-journal-gatewayd.* disable systemd-journal-remote.* disable systemd-journal-upload.* +enable systemd-pstore.service + # Passive targets: always off by default, since they should only be pulled in # by dependent units. |