From e3b192626e24cbd3a4dc2c7d5fb9a3b3fd136e24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 29 Feb 2020 09:48:44 +0100
Subject: [PATCH 1/3] man: tweak markup in systemd-pstore.service(8)

---
 man/systemd-pstore.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/man/systemd-pstore.xml b/man/systemd-pstore.xml
index 11d66b8b01..14dd72262d 100644
--- a/man/systemd-pstore.xml
+++ b/man/systemd-pstore.xml
@@ -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>

From aa07dc70932837bfeda982affe53f01d36ec6efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 29 Feb 2020 09:57:06 +0100
Subject: [PATCH 2/3] man: add .service suffix to systemd-pstore(8)

That is the pattern that we always use with executables not in
$PATH.
---
 man/rules/meson.build                                  | 2 +-
 man/{systemd-pstore.xml => systemd-pstore.service.xml} | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename man/{systemd-pstore.xml => systemd-pstore.service.xml} (95%)

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
similarity index 95%
rename from man/systemd-pstore.xml
rename to man/systemd-pstore.service.xml
index 14dd72262d..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>

From 5926ea0a6860095eaa83403417cbbf345db864f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 29 Feb 2020 10:01:39 +0100
Subject: [PATCH 3/3] presets: enable systemd-pstore.service by default

It has no effect is the pstore is not used, and prevents the non-volatile
storage from filling up if is used by the kernel.

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=952767
---
 presets/90-systemd.preset | 2 ++
 1 file changed, 2 insertions(+)

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.