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

Merge pull request #18321 from groxxda/cleanup

Browse Source 
various: minor cleanup
This commit is contained in:
Eelco Dolstra 2016-09-05 17:11:45 +02:00 committed by GitHub
commit 1a1a31c9d8
4 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/ttys/agetty.nix
View File

@ -80,8 +80,7 @@ in
}; };
systemd.services."container-getty@" = 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; restartIfChanged = false;
}; };

2
nixos/modules/system/boot/networkd.nix
View File

@ -677,7 +677,7 @@ in
}; };
systemd.services.systemd-networkd-wait-online = { systemd.services.systemd-networkd-wait-online = {
before = [ "network-online.target" "ip-up.target" ]; before = [ "ip-up.target" ];
wantedBy = [ "network-online.target" "ip-up.target" ]; wantedBy = [ "network-online.target" "ip-up.target" ];
}; };

12
nixos/modules/system/boot/systemd.nix
View File

@ -14,6 +14,7 @@ let
upstreamSystemUnits = upstreamSystemUnits =
[ # Targets. [ # Targets.
"basic.target" "basic.target"
"busnames.target"
"sysinit.target" "sysinit.target"
"sockets.target" "sockets.target"
"graphical.target" "graphical.target"
@ -140,6 +141,7 @@ let
"user.slice" "user.slice"
"machine.slice" "machine.slice"
"systemd-machined.service" "systemd-machined.service"
"systemd-nspawn@.service"
# Temporary file creation / cleanup. # Temporary file creation / cleanup.
"systemd-tmpfiles-clean.service" "systemd-tmpfiles-clean.service"
@ -727,16 +729,6 @@ in
systemd.targets.network-online.after = [ "ip-up.target" ]; 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 = systemd.units =
mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
// mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services

2
pkgs/development/libraries/dbus/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkgconfig, expat, systemd, glib, dbus_glib, python { stdenv, lib, fetchurl, pkgconfig, expat, systemd
, libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }: , libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }:
assert x11Support -> libX11 != null assert x11Support -> libX11 != null