+1
-1
nixos/doc/manual/administration/declarative-containers.section.md
+1
-1
nixos/doc/manual/administration/declarative-containers.section.md
···
+2
-2
nixos/doc/manual/administration/imperative-containers.section.md
+2
-2
nixos/doc/manual/administration/imperative-containers.section.md
···
+2
-2
nixos/doc/manual/from_md/administration/declarative-containers.section.xml
+2
-2
nixos/doc/manual/from_md/administration/declarative-containers.section.xml
···
+3
-2
nixos/doc/manual/from_md/administration/imperative-containers.section.xml
+3
-2
nixos/doc/manual/from_md/administration/imperative-containers.section.xml
···
+20
-11
nixos/modules/virtualisation/nixos-containers.nix
+20
-11
nixos/modules/virtualisation/nixos-containers.nix
···+configurationPrefix = optionalString (versionAtLeast config.system.stateVersion "22.05") "nixos-";············-unitConfig.RequiresMountsFor = lib.optional (!containerConfig.ephemeral) "/var/lib/containers/%i";-environment.root = if containerConfig.ephemeral then "/run/containers/%i" else "/var/lib/containers/%i";+unitConfig.RequiresMountsFor = lib.optional (!containerConfig.ephemeral) "${stateDirectory}/%i";+environment.root = if containerConfig.ephemeral then "/run/nixos-containers/%i" else "${stateDirectory}/%i";······let mkPortStr = p: p.protocol + ":" + (toString p.hostPort) + ":" + (if p.containerPort == null then toString p.hostPort else toString p.containerPort);···
+3
-3
nixos/tests/containers-ephemeral.nix
+3
-3
nixos/tests/containers-ephemeral.nix
······
+6
-6
nixos/tests/containers-imperative.nix
+6
-6
nixos/tests/containers-imperative.nix
·········
+5
-5
nixos/tests/containers-tmpfs.nix
+5
-5
nixos/tests/containers-tmpfs.nix
·········