From 7ccd49546562fa11db090ec9d7bfc2b20fae6fbd Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 22 Aug 2023 18:21:51 +0800 Subject: [PATCH] apptainer, singularity: drop obsolete LOCALSTATEDIR dirs Leave only the SESSIONDIR, which is "$LOCALSTATEDIR/$projectName/mnt/session" --- nixos/modules/programs/singularity.nix | 4 ---- pkgs/build-support/singularity-tools/default.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/programs/singularity.nix b/nixos/modules/programs/singularity.nix index 05fdb4842c54..2e2074654715 100644 --- a/nixos/modules/programs/singularity.nix +++ b/nixos/modules/programs/singularity.nix @@ -82,10 +82,6 @@ in }; systemd.tmpfiles.rules = [ "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 -" ]; }; diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index 9689e4124590..8d7ad9e742a1 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -111,7 +111,7 @@ rec { touch .${projectName}.d/env/94-appsbase.sh cd .. - mkdir -p /var/lib/${projectName}/mnt/{container,final,overlay,session,source} + mkdir -p /var/lib/${projectName}/mnt/session echo "root:x:0:0:System administrator:/root:/bin/sh" > /etc/passwd echo > /etc/resolv.conf TMPDIR=$(pwd -P) ${projectName} build $out ./img