nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-17 12:50:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #250949 from ShamrockLee/apptainer-localstatedir

Browse Source 
apptainer, singularity: use self-contained LOCALSTATEDIR by default
This commit is contained in:
Silvan Mosberger
2023-11-23 01:37:54 +01:00
committed by GitHub
parent c10d7026fb ac77669531
commit bf01ec00a0
4 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nixos/modules/programs/singularity.nix
View File

@@ -45,6 +45,18 @@ in
Use `lib.mkForce` to forcefully specify the overridden package.
'';
};
enableExternalLocalStateDir = mkOption {
type = types.bool;
default = true;
example = false;
description = mdDoc ''
Whether to use top-level directories as LOCALSTATEDIR
instead of the store path ones.
This affects the SESSIONDIR of Apptainer/Singularity.
If set to true, the SESSIONDIR will become
`/var/lib/''${projectName}/mnt/session`.
'';
};
enableFakeroot = mkOption {
type = types.bool;
default = true;
@@ -65,7 +77,9 @@ in
config = mkIf cfg.enable {
programs.singularity.packageOverriden = (cfg.package.override (
optionalAttrs cfg.enableFakeroot {
optionalAttrs cfg.enableExternalLocalStateDir {
externalLocalStateDir = "/var/lib";
} // optionalAttrs cfg.enableFakeroot {
newuidmapPath = "/run/wrappers/bin/newuidmap";
newgidmapPath = "/run/wrappers/bin/newgidmap";
} // optionalAttrs cfg.enableSuid {
@@ -80,12 +94,8 @@ in
group = "root";
source = "${cfg.packageOverriden}/libexec/${cfg.packageOverriden.projectName}/bin/starter-suid.orig";
};
systemd.tmpfiles.rules = [
systemd.tmpfiles.rules = mkIf cfg.enableExternalLocalStateDir [
"d /var/lib/${cfg.packageOverriden.projectName}/mnt/session 0770 root root -"
"d /var/lib/${cfg.packageOverriden.projectName}/mnt/final 0770 root root -"
"d /var/lib/${cfg.packageOverriden.projectName}/mnt/overlay 0770 root root -"
"d /var/lib/${cfg.packageOverriden.projectName}/mnt/container 0770 root root -"
"d /var/lib/${cfg.packageOverriden.projectName}/mnt/source 0770 root root -"
];
};