chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ordering of activation operations

Browse source
This commit is contained in:
Charlotte Van Petegem 2022-09-03 10:04:06 +02:00
parent b6e9f10fc3
commit 4b6a7eafda
No known key found for this signature in database
GPG key ID: 019E764B7184435A
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/base/zfs/default.nix
View file

@ -92,7 +92,8 @@
system.activationScripts = system.activationScripts =
let let
ensureSystemExistsScript = lib.concatStringsSep "\n" (map (path: ''mkdir -p "${path}"'') config.chvp.base.zfs.ensureSystemExists); ensureSystemExistsScript = lib.concatStringsSep "\n" (map (path: ''mkdir -p "${path}"'') config.chvp.base.zfs.ensureSystemExists);
ensureHomeExistsScript = lib.concatStringsSep "\n" (map (path: ''mkdir -p "/home/charlotte/${path}"; chown charlotte:users /home/charlotte/${path};'') config.chvp.base.zfs.ensureHomeExists); ensureHomeExistsScript = lib.concatStringsSep "\n" (map (path: ''mkdir -p "/home/charlotte/${path}"'') config.chvp.base.zfs.ensureHomeExists);
ensureHomePermissionsScript = lib.concatStringsSep "\n" (map (path: ''chown charlotte:users /home/charlotte/${path}'') config.chvp.base.zfs.ensureHomeExists);
in in
{ {
ensureSystemPathsExist = { ensureSystemPathsExist = {
@ -104,9 +105,15 @@
mkdir -p /home/charlotte/ mkdir -p /home/charlotte/
${ensureHomeExistsScript} ${ensureHomeExistsScript}
''; '';
deps = [ "users" "groups" ];
}; };
agenixInstall.deps = [ "ensureSystemPathsExist" "ensureHomePathsExist" ]; agenixInstall.deps = [ "ensureSystemPathsExist" "ensureHomePathsExist" ];
ensureHomePermissionsScript = {
text = ''
chown charlotte:users /home/charlotte
${ensureHomePermissionsScript}
'';
deps = [ "agenixInstall" "users" "groups" ];
};
}; };
systemd.services = systemd.services =