diff options
| author | Christian Kögler <ck3d@gmx.de> | 2022-02-17 22:07:05 +0100 |
|---|---|---|
| committer | Christian Kögler <ck3d@gmx.de> | 2022-02-19 09:52:37 +0100 |
| commit | 57fc08cfdbd1a3a59f26416814dc10f8379d6e67 (patch) | |
| tree | b8c5823f2cb78efa4956bb37c6c83281ef242053 /nixos/modules/system | |
| parent | a67c25d5f665674aeb462c36d80fed0f0557e3a7 (diff) | |
| download | nixpkgs-57fc08cfdbd1a3a59f26416814dc10f8379d6e67.tar nixpkgs-57fc08cfdbd1a3a59f26416814dc10f8379d6e67.tar.gz nixpkgs-57fc08cfdbd1a3a59f26416814dc10f8379d6e67.tar.bz2 nixpkgs-57fc08cfdbd1a3a59f26416814dc10f8379d6e67.tar.lz nixpkgs-57fc08cfdbd1a3a59f26416814dc10f8379d6e67.tar.xz nixpkgs-57fc08cfdbd1a3a59f26416814dc10f8379d6e67.tar.zst nixpkgs-57fc08cfdbd1a3a59f26416814dc10f8379d6e67.zip | |
nixos: Switch to default systemd-nspawn behaviour
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/systemd-nspawn.nix | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix index 02d2660add8..0c6822319a5 100644 --- a/nixos/modules/system/boot/systemd-nspawn.nix +++ b/nixos/modules/system/boot/systemd-nspawn.nix @@ -120,14 +120,6 @@ in { }) { systemd.targets.multi-user.wants = [ "machines.target" ]; - - # Workaround for https://github.com/NixOS/nixpkgs/pull/67232#issuecomment-531315437 and https://github.com/systemd/systemd/issues/13622 - # Once systemd fixes this upstream, we can re-enable -U - systemd.services."systemd-nspawn@".serviceConfig.ExecStart = [ - "" # deliberately empty. signals systemd to override the ExecStart - # Only difference between upstream is that we do not pass the -U flag - "${config.systemd.package}/bin/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth --settings=override --machine=%i" - ]; } ]; } |