security/hakurei
6
3
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases 11 Wiki Activity

nix: set x-systemd options directly
All checks were successful
Test / ShareFS (push) Successful in 40s
Details
Test / Sandbox (race detector) (push) Successful in 44s
Details
Test / Create distribution (push) Successful in 43s
Details
Test / Sandbox (push) Successful in 48s
Details
Test / Hpkg (push) Successful in 49s
Details
Test / Hakurei (push) Successful in 56s
Details
Test / Hakurei (race detector) (push) Successful in 55s
Details
Test / Flake checks (push) Successful in 1m36s
Details

Browse Source 
NixOS generates two x-systemd.requires-mounts-for options for some reason, and there seems to be no knob for configuring ordering.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2025-12-28 09:41:13 +09:00
parent c9cd16fd2a
commit 924e411417
1 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
nixos.nix
View File

@@ -25,26 +25,34 @@ let
getsubname = userid: appid: "u${toString userid}_a${toString appid}"; getsubname = userid: appid: "u${toString userid}_a${toString appid}";
getsubhome = userid: appid: "${cfg.stateDir}/u${toString userid}/a${toString appid}"; getsubhome = userid: appid: "${cfg.stateDir}/u${toString userid}/a${toString appid}";
mountpoints = { mountpoints =
${cfg.sharefs.name} = mkIf (cfg.sharefs.source != null) { let
depends = [ cfg.sharefs.source ]; after = "sys-module-fuse.device";
device = "sharefs"; before = "nix-daemon.socket";
fsType = "fuse.sharefs"; in
noCheck = true; {
options = [ ${cfg.sharefs.name} = mkIf (cfg.sharefs.source != null) {
"rw" device = "sharefs";
"noexec" fsType = "fuse.sharefs";
"nosuid" options = [
"nodev" "rw"
"noatime" "noexec"
"allow_other" "nosuid"
"mkdir" "nodev"
"source=${cfg.sharefs.source}" "noatime"
"setuid=${toString config.users.users.${cfg.sharefs.user}.uid}" "allow_other"
"setgid=${toString config.users.groups.${cfg.sharefs.group}.gid}" "mkdir"
]; "source=${cfg.sharefs.source}"
"setuid=${toString config.users.users.${cfg.sharefs.user}.uid}"
"setgid=${toString config.users.groups.${cfg.sharefs.group}.gid}"
"x-systemd.requires=${after}"
"x-systemd.before=${before}"
"x-systemd.required-by=${before}"
"x-systemd.requires-mounts-for=${cfg.sharefs.source}"
];
};
}; };
};
in in
{ {