liminix

commit 25d9da967ce1ab5ef9fa483b0c9186559306f335
parent aa1a2e5d75794d53b256d969f99872e88b53a8c5
Author: Daniel Barlow <dan@telent.net>
Date:   Tue,  4 Apr 2023 23:23:22 +0100

remove support for sockets in pseudofiles

(1) we can't make them on a real filesystem except by running
something that calls socket()
(2) whyever would we want to?

Diffstat:
M
modules/s6/default.nix
 | 
2
--
M
pkgs/pseudofile/default.nix
 | 
3
+--
M
tests/pseudofiles/fixture.nix
 | 
2
--

3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/modules/s6/default.nix b/modules/s6/default.nix
@@ -41,7 +41,6 @@ let
     s6-linux-init-shutdownd = dir {
       fifo = {
         type = "i";
-        subtype = "f";
         mode = "0600";
       };
       run = {
@@ -55,7 +54,6 @@ let
     s6-svscan-log = dir {
       fifo = {
         type = "i";
-        subtype = "f";
         mode = "0600";
       };
       notification-fd = { file = "3"; };
diff --git a/pkgs/pseudofile/default.nix b/pkgs/pseudofile/default.nix
@@ -20,7 +20,6 @@ let
             , file ? null
             , major ? null
             , minor ? null
-            , subtype ? null
           }:
             let
               mode' = if mode != null then mode else
@@ -36,7 +35,7 @@ let
               else if type == "b" then "${line} ${major} ${minor}"
               else if type == "s" then "${line} ${target}"
               else if type == "l" then "${pathname} l ${target}"
-              else if type == "i" then "${line} ${subtype}"
+              else if type == "i" then "${line} f"
               else line)
           attrset;
     in builtins.concatStringsSep "\n" l;
diff --git a/tests/pseudofiles/fixture.nix b/tests/pseudofiles/fixture.nix
@@ -17,7 +17,6 @@
       s6-linux-init-shutdownd = dir {
         fifo = {
           type = "i";
-          subtype = "f";
           mode = "0600";
         };
         run = {
@@ -31,7 +30,6 @@
       s6-svscan-log = dir {
         fifo = {
           type = "i";
-          subtype = "f";
           mode = "0600";
         };
         notification-fd = { file = "3"; };