diff --git a/modules/s6/default.nix b/modules/s6/default.nix index 75253ed..171f42f 100644 --- 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 index bdde354..71b0c68 100644 --- 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 index 043b23d..da96e6a 100644 --- 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"; };