@@ -70,7 +70,7 @@ let
7070 startScript = cfg:
7171 ''
7272 mkdir -p -m 0755 "$root/etc" "$root/var/lib"
73− mkdir -p -m 0700 "$root/var/lib/private" "$root/root"
73+ mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers
7474 if ! [ -e "$root/etc/os-release" ]; then
7575 touch "$root/etc/os-release"
7676 fi
@@ -248,7 +248,7 @@ let
248248
249249 Type = "notify";
250250
251− RuntimeDirectory = [ "containers" ] ++ lib.optional cfg.ephemeral "containers/%i";
251+ RuntimeDirectory = lib.optional cfg.ephemeral "containers/%i";
252252
253253 # Note that on reboot, systemd-nspawn returns 133, so this
254254 # unit will be restarted. On poweroff, it returns 0, so the
@@ -683,8 +683,15 @@ in
683683 unit = {
684684 description = "Container '%i'";
685685
686+ unitConfig.RequiresMountsFor = "/var/lib/containers/%i";
687+
686688 path = [ pkgs.iproute ];
687689
690+ environment = {
691+ root = "/var/lib/containers/%i";
692+ INSTANCE = "%i";
693+ };
694+
688695 preStart = preStartScript dummyConfig;
689696
690697 script = startScript dummyConfig;
@@ -722,14 +729,13 @@ in
722729 }
723730 else {});
724731 in
725− unit // {
732+ recursiveUpdate unit {
726733 preStart = preStartScript containerConfig;
727734 script = startScript containerConfig;
728735 postStart = postStartScript containerConfig;
729736 serviceConfig = serviceDirectives containerConfig;
730737 unitConfig.RequiresMountsFor = lib.optional (!containerConfig.ephemeral) "/var/lib/containers/%i";
731738 environment.root = if containerConfig.ephemeral then "/run/containers/%i" else "/var/lib/containers/%i";
732− environment.INSTANCE = "%i";
733739 } // (
734740 if containerConfig.autoStart then
735741 {