Commit 7e2453c3 authored by Yueh-Shun Li's avatar Yueh-Shun Li
Browse files

apptainer, singularity: drop obsolete LOCALSTATEDIR dirs 

Leave only the SESSIONDIR, which is "$LOCALSTATEDIR/$projectName/mnt/session"
parent e42a638b

nixos/modules/programs/singularity.nix

+0 −4
Original line number Diff line number Diff line
@@ -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 -"

    ];

  };

pkgs/build-support/singularity-tools/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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