From cc94ef57fa6b83e54c12b9c4ed5a8ccd0c4590c8 Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Wed, 1 Jan 2025 18:20:03 +0000
Subject: [PATCH] in rc.init copy log from previous boot to place of safety

---
 doc/admin.rst              | 13 ++-----------
 modules/s6/scripts/rc.init |  5 +++++
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/doc/admin.rst b/doc/admin.rst
index 9a12881..3a4ec7a 100644
--- a/doc/admin.rst
+++ b/doc/admin.rst
@@ -145,17 +145,8 @@ to :file:`/dev/pmsg0` as well as to the regular log. This is a
 circular buffer, so when it fills up newer messages will overwrite the
 oldest messages.
 
-To check the previous messages after a (planned or forced) reboot,
-you need to mooun the pstore filesystem.
-
-.. code-block:: console
-
-    # mount -t pstore pstore /sys/fs/pstore/
-    # ls -l /sys/fs/pstore/
-    -r--r--r--    1     43071 pmsg-ramoops-0
-    # cat /sys/fs/pstore/pmsg-ramoops-0
-    @40000000000000282c997d29 mydevice klogd <6>[   30.793756] int: port 2(wlan0) entered blocking state
-    [log messages from before the reboot follow]
+Logs found in pstore after a reboot will be moved at startup to
+:file:`/run/log/previous-boot`
 
 
 
diff --git a/modules/s6/scripts/rc.init b/modules/s6/scripts/rc.init
index c098ffb..1c1b031 100755
--- a/modules/s6/scripts/rc.init
+++ b/modules/s6/scripts/rc.init
@@ -22,6 +22,11 @@ mount -t tmpfs none /tmp
 mkdir /dev/pts
 mount -t devpts none /dev/pts
 
+if test -c /dev/pmsg0 ; then
+    mount -t pstore none /sys/fs/pstore
+    (cat /sys/fs/pstore/* && rm  /sys/fs/pstore/*) > /run/log/previous-boot
+fi
+
 mkdir -m 0751 -p /run/services/outputs
 chgrp system /run/services/outputs