gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/nixos-containers: user options take precedence over module ones

Browse Source 
I think this is the norm in NixOS modules. This allows to start a
container with '--volatile=overlay --link-journal=host' in order to
persist logs across runs of a container running with a temporary root.
While '--ephemeral' omits '--link-journal=try-guest', it's not possible
to run an ephemeral container when linking the journal:
https://github.com/systemd/systemd/issues/1666
This commit is contained in:
Kevin Boulain
2025-03-09 10:41:42 +01:00
parent e3e32b642a
commit c2d4e8f4cb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/virtualisation/nixos-containers.nix
View File

@@ -178,7 +178,6 @@ let
exec ${config.systemd.package}/bin/systemd-nspawn \ exec ${config.systemd.package}/bin/systemd-nspawn \
--keep-unit \ --keep-unit \
-M "$INSTANCE" -D "$root" "''${extraFlags[@]}" \ -M "$INSTANCE" -D "$root" "''${extraFlags[@]}" \
$EXTRA_NSPAWN_FLAGS \
--notify-ready=yes \ --notify-ready=yes \
--kill-signal=SIGRTMIN+3 \ --kill-signal=SIGRTMIN+3 \
--bind-ro=/nix/store:/nix/store$NIX_BIND_OPT \ --bind-ro=/nix/store:/nix/store$NIX_BIND_OPT \
@@ -203,6 +202,7 @@ let
${optionalString (cfg.tmpfs != null && cfg.tmpfs != []) ${optionalString (cfg.tmpfs != null && cfg.tmpfs != [])
''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}'' ''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}''
} \ } \
$EXTRA_NSPAWN_FLAGS \
${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" ${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init"
''; '';