movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-09 03:55:44 +03:00
Code Activity

systemd: 231 -> 232

Browse source 
Includes adding some more upstream units and removing obsolete (-.slice) ones.
This commit is contained in:
Robin Gloster 2017-01-26 01:52:38 +01:00
parent 6973c7739e
commit a38f1911d3
No known key found for this signature in database
GPG key ID: 5E4C836C632C2882
4 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/system/boot/networkd.nix
View file

@ -667,8 +667,10 @@ in
config = mkIf config.systemd.network.enable {
systemd.additionalUpstreamSystemUnits =
[ "systemd-networkd.service" "systemd-networkd-wait-online.service" ];
systemd.additionalUpstreamSystemUnits = [
"systemd-networkd.service" "systemd-networkd-wait-online.service"
"org.freedesktop.network1.busname"
];
systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links
// mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs

4
nixos/modules/system/boot/resolved.nix
View file

@ -71,7 +71,9 @@ in
config = mkIf cfg.enable {
systemd.additionalUpstreamSystemUnits = [ "systemd-resolved.service" ];
systemd.additionalUpstreamSystemUnits = [
"systemd-resolved.service" "org.freedesktop.resolve1.busname"
];
systemd.services.systemd-resolved = {
wantedBy = [ "multi-user.target" ];

20
nixos/modules/system/boot/systemd.nix
View file

@ -17,6 +17,7 @@ let
"busnames.target"
"sysinit.target"
"sockets.target"
"exit.target"
"graphical.target"
"multi-user.target"
"network.target"
@ -41,11 +42,13 @@ let
"systemd-udevd.service"
"systemd-udev-settle.service"
"systemd-udev-trigger.service"
"systemd-hwdb-update.service"
# Consoles.
"getty.target"
"getty@.service"
"serial-getty@.service"
"console-getty.service"
"container-getty@.service"
"systemd-vconsole-setup.service"
@ -72,6 +75,7 @@ let
"systemd-journal-flush.service"
"systemd-journal-gatewayd.socket"
"systemd-journal-gatewayd.service"
"systemd-journal-catalog-update.service"
"systemd-journald-audit.socket"
"systemd-journald-dev-log.socket"
"syslog.socket"
@ -104,6 +108,7 @@ let
"systemd-random-seed.service"
"systemd-backlight@.service"
"systemd-rfkill.service"
"systemd-rfkill.socket"
# Hibernate / suspend.
"hibernate.target"
@ -111,8 +116,8 @@ let
"sleep.target"
"hybrid-sleep.target"
"systemd-hibernate.service"
"systemd-suspend.service"
"systemd-hybrid-sleep.service"
"systemd-suspend.service"
# Reboot stuff.
"reboot.target"
@ -136,10 +141,10 @@ let
# Slices / containers.
"slices.target"
"-.slice"
"system.slice"
"user.slice"
"machine.slice"
"machines.target"
"systemd-machined.service"
"systemd-nspawn@.service"
@ -162,12 +167,12 @@ let
"systemd-localed.service"
"systemd-hostnamed.service"
"systemd-binfmt.service"
"systemd-exit.service"
]
++ cfg.additionalUpstreamSystemUnits;
upstreamSystemWants =
[ #"basic.target.wants"
"sysinit.target.wants"
[ "sysinit.target.wants"
"sockets.target.wants"
"local-fs.target.wants"
"multi-user.target.wants"
@ -176,11 +181,18 @@ let
upstreamUserUnits =
[ "basic.target"
"bluetooth.target"
"busnames.target"
"default.target"
"exit.target"
"graphical-session-pre.target"
"graphical-session.target"
"paths.target"
"printer.target"
"shutdown.target"
"smartcard.target"
"sockets.target"
"sound.target"
"systemd-exit.service"
"timers.target"
];