diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-05 17:11:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-05 17:11:45 +0200 |
| commit | 1a1a31c9d80237a3a8264d98fb14e0e24cdbd7b7 (patch) | |
| tree | 8b1f5d8b346912e768d4b81e3c644ee0e2da3e65 /nixos | |
| parent | 5b5c2fb9c08e3e9ee4ed27fce7863055d3c896d1 (diff) | |
| parent | 53f3c2a2783b8c910b98b1a6a25e75d7a1f04ec8 (diff) | |
| download | nixlib-1a1a31c9d80237a3a8264d98fb14e0e24cdbd7b7.tar nixlib-1a1a31c9d80237a3a8264d98fb14e0e24cdbd7b7.tar.gz nixlib-1a1a31c9d80237a3a8264d98fb14e0e24cdbd7b7.tar.bz2 nixlib-1a1a31c9d80237a3a8264d98fb14e0e24cdbd7b7.tar.lz nixlib-1a1a31c9d80237a3a8264d98fb14e0e24cdbd7b7.tar.xz nixlib-1a1a31c9d80237a3a8264d98fb14e0e24cdbd7b7.tar.zst nixlib-1a1a31c9d80237a3a8264d98fb14e0e24cdbd7b7.zip | |
Merge pull request #18321 from groxxda/cleanup
various: minor cleanup
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/ttys/agetty.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/system/boot/networkd.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 12 |
3 files changed, 4 insertions, 13 deletions
diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix index ea7196fc8733..051d54e932fb 100644 --- a/nixos/modules/services/ttys/agetty.nix +++ b/nixos/modules/services/ttys/agetty.nix @@ -80,8 +80,7 @@ in }; systemd.services."container-getty@" = - { unitConfig.ConditionPathExists = "/dev/pts/%I"; # Work around being respawned when "machinectl login" exits. - serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM"; + { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM"; restartIfChanged = false; }; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index ab7485500261..b79683660c5d 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -677,7 +677,7 @@ in }; systemd.services.systemd-networkd-wait-online = { - before = [ "network-online.target" "ip-up.target" ]; + before = [ "ip-up.target" ]; wantedBy = [ "network-online.target" "ip-up.target" ]; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index df72be1b4be5..3fa257f96685 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -14,6 +14,7 @@ let upstreamSystemUnits = [ # Targets. "basic.target" + "busnames.target" "sysinit.target" "sockets.target" "graphical.target" @@ -140,6 +141,7 @@ let "user.slice" "machine.slice" "systemd-machined.service" + "systemd-nspawn@.service" # Temporary file creation / cleanup. "systemd-tmpfiles-clean.service" @@ -727,16 +729,6 @@ in systemd.targets.network-online.after = [ "ip-up.target" ]; - systemd.targets.network-pre = { - wantedBy = [ "network.target" ]; - before = [ "network.target" ]; - }; - - systemd.targets.remote-fs-pre = { - wantedBy = [ "remote-fs.target" ]; - before = [ "remote-fs.target" ]; - }; - systemd.units = mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services |