swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updates for systemd 198/199

Browse source
This commit is contained in:
Eelco Dolstra 2013-03-27 13:58:12 +01:00
parent 8b9216fdcb
commit f3bea050f8
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/services/logging/rsyslogd.nix
View file

@ -90,7 +90,7 @@ in
requires = [ "syslog.socket" ];
wantedBy = [ "multi-user.target" "syslog.target" ];
wantedBy = [ "multi-user.target" ];
environment.TZ = config.time.timeZone;

2
modules/services/logging/syslogd.nix
View file

@ -110,7 +110,7 @@ in
requires = [ "syslog.socket" ];
wantedBy = [ "multi-user.target" "syslog.target" ];
wantedBy = [ "multi-user.target" ];
environment.TZ = config.time.timeZone;

1
modules/services/system/dbus.nix
View file

@ -132,7 +132,6 @@ in
[Unit]
Description=D-Bus System Message Bus
Requires=dbus.socket
After=syslog.target
[Service]
ExecStartPre=${pkgs.dbus_tools}/bin/dbus-uuidgen --ensure

8
modules/system/boot/systemd.nix
View file

@ -31,10 +31,11 @@ let
"network.target"
"nss-lookup.target"
"nss-user-lookup.target"
"syslog.target"
"time-sync.target"
#"cryptsetup.target"
"sigpwr.target"
"timers.target"
"paths.target"
# Rescue mode.
"rescue.target"
@ -108,8 +109,10 @@ let
"hibernate.target"
"suspend.target"
"sleep.target"
"hybrid-sleep.target"
"systemd-hibernate.service"
"systemd-suspend.service"
"systemd-hybrid-sleep.service"
"systemd-shutdownd.socket"
"systemd-shutdownd.service"
@ -139,12 +142,13 @@ let
];
upstreamWants =
[ "basic.target.wants"
[ #"basic.target.wants"
"sysinit.target.wants"
"sockets.target.wants"
"local-fs.target.wants"
"multi-user.target.wants"
"shutdown.target.wants"
"timers.target.wants"
];
makeJobScript = name: text: