systemconfig: improve filenames/pathnames

no more make-stuff

devices/turris-omnia/default.nix

@@ -225,11 +225,6 @@
             # WARNING: unmet direct dependencies detected for ARCH_WANT_LIBATA_LEDS
             ATA = "y";
 
-            PSTORE = "y";
-            PSTORE_RAM = "y";
-            PSTORE_CONSOLE = "y";
-#            PSTORE_DEFLATE_COMPRESS = "n";
-
             BLOCK = "y";
             MMC="y";
             PWRSEQ_EMMC="y";        # ???

doc/admin.rst

@@ -138,9 +138,15 @@ Logs written to :file:`/run/log/` will not survive a reboot or crash,
 as it is an ephemeral filesystem.
 
 On supported hardware you can enable logging to `pstore
-<https://www.kernel.org/doc/Documentation/ABI/testing/pstore>` which
-means the most recent log messages will be preserved on reboot.
-Set the config option ``logging.persistent.enable = true``, log messages will be written to :file:/dev/pmsg0.  After rebooting,
+<https://www.kernel.org/doc/Documentation/ABI/testing/pstore>`_ which
+means the most recent log messages will be preserved on reboot.  Set
+the config option ``logging.persistent.enable = true`` to log messages
+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
 

pkgs/systemconfig/default.nix

@@ -56,31 +56,31 @@ let
                     else "";
           in "unlink(${qpathname}); ${cmd} ${chown}";
     in mapAttrsToList (makeFile prefix) attrset;
-  activateScript = attrset: writeText "makedevs.c" ''
-    #include "defs.h"
-    int main(int argc, char* argv[]) {
-      chdir(argv[1]);
-      ${(builtins.concatStringsSep "\n" (visit "." attrset))}
-    }
-  '';
 in attrset:
-  let makedevs = activateScript attrset;
+  let
+    activateScript = writeText "activate.c" ''
+      #include "defs.h"
+      int main(int argc, char* argv[]) {
+        chdir(argv[1]);
+        ${(builtins.concatStringsSep "\n" (visit "." attrset))}
+      }
+    '';
   in stdenv.mkDerivation {
-    name="make-stuff";
+    name="system-configuration";
     src = ./.;
 
     CFLAGS = "-Os";
     LDFLAGS  = "-static -Xlinker -static";
 
     postConfigure = ''
-      cp ${makedevs} makedevs.c
+      cp ${activateScript} activate.c
     '';
-    makeFlags = ["makedevs"];
+    makeFlags = ["activate"];
     installPhase = ''
-      closure=${closureInfo { rootPaths = [ makedevs ]; }}
+      closure=${closureInfo { rootPaths = [ activateScript ]; }}
       mkdir -p $out/bin $out/etc
       cp $closure/store-paths $out/etc/nix-store-paths
-      $STRIP --remove-section=.note  --remove-section=.comment --strip-all makedevs -o $out/bin/activate
+      $STRIP --remove-section=.note  --remove-section=.comment --strip-all activate -o $out/bin/activate
       ln -s ${s6-init-bin}/bin/init $out/bin/init
       cp -p ${writeFennel "restart-services" {} ./restart-services.fnl} $out/bin/restart-services
       # obfuscate the store path of min-copy-closure so that the output