ci.nix

@@ -12,7 +12,6 @@ let
     "qemu-armv7l"
     "tp-archer-ax23"
     "zyxel-nwa50ax"
-    "turris-omnia"
   ];
   vanilla = ./vanilla-configuration.nix;
   for-device = name:

devices/gl-ar750/pstore-ramoops.dtsi

@@ -3,7 +3,8 @@ reserved-memory {
 		ramoops@03f00000 {
 			compatible = "ramoops";
 			reg = <0x03f00000 0x10000>;
-			pmsg-size = <0x10000>;
+			record-size = <0x1000>;
+			pmsg-size = <0x1000>;
 		};
 	};
 };

devices/turris-omnia/default.nix

@@ -173,7 +173,6 @@
         ../../modules/outputs/tftpboot.nix
         ../../modules/outputs/mbrimage.nix
         ../../modules/outputs/extlinux.nix
-        ../../modules/outputs/system-configuration.nix
       ];
 
       config = {
@@ -342,7 +341,7 @@
             targets = ["ath9k" "ath10k_pci"];
           };
         in {
-          defaultOutput = "systemConfiguration";
+          defaultOutput = "mtdimage";
           loadAddress = lim.parseInt "0x00800000"; # "0x00008000";
           entryPoint = lim.parseInt "0x00800000"; # "0x00008000";
           rootDevice = "/dev/mmcblk0p1";

doc/admin.rst

@@ -131,26 +131,6 @@ human-readable format, use :command:`s6-tai64nlocal`.
   1970-01-02 21:51:48.832588765 wan.link.pppoe sent [LCP ConfReq id=0x1 <asyncmap 0x0> <magic 0x667a9594> <pcomp> <accom
   p>]
 
-Log persistence
----------------
-
-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,
-
-.. 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]
-
 
 
 Updating an installed system (JFFS2)

modules/all-modules.nix

@@ -30,6 +30,7 @@
    ./outputs/vmroot.nix
    ./ppp
    ./ramdisk.nix
+   ./squashfs.nix
    ./ssh
    ./users.nix
    ./vlan

modules/outputs.nix

@@ -11,7 +11,7 @@ let
 in
 {
   imports = [
-    ./outputs/squashfs.nix
+    ./squashfs.nix
     ./outputs/vmroot.nix
     ./outputs/extlinux.nix
   ];

modules/outputs/initramfs.nix

@@ -9,7 +9,6 @@ let
   inherit (pkgs) runCommand;
 in
 {
-  imports = [ ./system-configuration.nix ];
   options = {
     boot.initramfs = {
       enable = mkEnableOption "initramfs";
@@ -23,6 +22,14 @@ in
           filesystem
         '';
       };
+      systemConfiguration = mkOption {
+        type = types.package;
+        description = ''
+          pkgs.systemconfig for the configured filesystem,
+          contains 'activate' and 'init' commands
+        '';
+        internal = true;
+      };
     };
   };
   config = mkIf config.boot.initramfs.enable {
@@ -46,6 +53,8 @@ in
           file /init ${pkgs.preinit}/bin/preinit 0755 0 0
           SPECIALS
         '';
+      systemConfiguration =
+        pkgs.systemconfig config.filesystem.contents;
     };
   };
 }

modules/outputs/system-configuration.nix

@@ -1,28 +0,0 @@
-{
-  config
-, pkgs
-, lib
-, ...
-}:
-let
-  inherit (lib) mkEnableOption mkOption mkIf types;
-  inherit (pkgs) runCommand;
-in
-{
-  options = {
-    system.outputs = {
-      systemConfiguration = mkOption {
-        type = types.package;
-        description = ''
-          pkgs.systemconfig for the configured filesystem,
-          contains 'activate' and 'init' commands
-        '';
-        internal = true;
-      };
-    };
-  };
-  config = {
-    system.outputs.systemConfiguration =
-        pkgs.systemconfig config.filesystem.contents;
-  };
-}

modules/s6/default.nix

@@ -7,27 +7,10 @@ let
     s6-linux-init
     stdenvNoCC;
   inherit (lib.lists) unique concatMap;
-  inherit (lib) concatStrings;
-  inherit (builtins) map;
   inherit (pkgs.pseudofile) dir symlink;
   inherit (pkgs.liminix.services) oneshot bundle longrun;
   inherit (lib) mkIf mkEnableOption mkOption types;
   cfg = config.logging;
-
-  logger =
-    let pipecmds =
-          ["${s6}/bin/s6-log -bpd3 -- ${cfg.script} 1"] ++
-          (lib.optional cfg.persistent.enable
-            "/bin/tee /dev/pmsg0") ++
-          (lib.optional cfg.shipping.enable
-            "${pkgs.logshipper}/bin/logtap ${cfg.shipping.socket} logshipper-socket-event");
-    in ''
-      #!${execline}/bin/execlineb -P
-      ${execline}/bin/redirfd -w 1 /dev/null
-      ${execline}/bin/redirfd -rnb 0 fifo
-      ${concatStrings (map (l: "pipeline { ${l} }\n") pipecmds)}
-      ${s6}/bin/s6-log -- ${cfg.directory}
-    '';
   s6-rc-db =
     let
       # In the default bundle we need to have all the services
@@ -123,7 +106,21 @@ let
         mode = "0600";
       };
       notification-fd = { file = "3"; };
-      run = { file = logger; mode = "0755"; };
+      run = {
+        file = ''
+              #!${execline}/bin/execlineb -P
+              ${execline}/bin/redirfd -w 1 /dev/null
+              ${execline}/bin/redirfd -rnb 0 fifo
+              ${if cfg.shipping.enable then ''
+                pipeline { ${s6}/bin/s6-log -bpd3 -- ${cfg.script} 1 }
+                pipeline { ${pkgs.logshipper}/bin/logtap ${cfg.shipping.socket} logshipper-socket-event }
+                ${s6}/bin/s6-log -- ${cfg.directory}
+              '' else ''
+                ${s6}/bin/s6-log -bpd3 -- ${cfg.script} ${cfg.directory}
+              ''}
+          '';
+        mode = "0755";
+      };
     };
     getty = dir {
       run = {

tests/jffs2/configuration.nix

@@ -4,7 +4,7 @@ let
 in {
   imports = [
     ../../vanilla-configuration.nix
-    ../../modules/outputs/squashfs.nix
+    ../../modules/squashfs.nix
     ../../modules/outputs/jffs2.nix
   ];
   config.rootfsType = "jffs2";