lbailly/liminix
1
0
Fork 0
forked from DGNum/liminix
Code Pull requests 2 Activity Actions

remove support for sockets in pseudofiles

Browse source 
(1) we can't make them on a real filesystem except by running
something that calls socket()
(2) whyever would we want to?
This commit is contained in:
Daniel Barlow 2023-04-04 23:23:22 +01:00
parent aa1a2e5d75
commit 25d9da967c
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/s6/default.nix
View file

@ -41,7 +41,6 @@ let
s6-linux-init-shutdownd = dir { s6-linux-init-shutdownd = dir {
fifo = { fifo = {
type = "i"; type = "i";
subtype = "f";
mode = "0600"; mode = "0600";
}; };
run = { run = {
@ -55,7 +54,6 @@ let
s6-svscan-log = dir { s6-svscan-log = dir {
fifo = { fifo = {
type = "i"; type = "i";
subtype = "f";
mode = "0600"; mode = "0600";
}; };
notification-fd = { file = "3"; }; notification-fd = { file = "3"; };

3
pkgs/pseudofile/default.nix
View file

@ -20,7 +20,6 @@ let
, file ? null , file ? null
, major ? null , major ? null
, minor ? null , minor ? null
, subtype ? null
}: }:
let let
mode' = if mode != null then mode else mode' = if mode != null then mode else
@ -36,7 +35,7 @@ let
else if type == "b" then "${line} ${major} ${minor}" else if type == "b" then "${line} ${major} ${minor}"
else if type == "s" then "${line} ${target}" else if type == "s" then "${line} ${target}"
else if type == "l" then "${pathname} l ${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) else line)
attrset; attrset;
in builtins.concatStringsSep "\n" l; in builtins.concatStringsSep "\n" l;

2
tests/pseudofiles/fixture.nix
View file

@ -17,7 +17,6 @@
s6-linux-init-shutdownd = dir { s6-linux-init-shutdownd = dir {
fifo = { fifo = {
type = "i"; type = "i";
subtype = "f";
mode = "0600"; mode = "0600";
}; };
run = { run = {
@ -31,7 +30,6 @@
s6-svscan-log = dir { s6-svscan-log = dir {
fifo = { fifo = {
type = "i"; type = "i";
subtype = "f";
mode = "0600"; mode = "0600";
}; };
notification-fd = { file = "3"; }; notification-fd = { file = "3"; };