public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 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" ]; requires = [ "syslog.socket" ];
wantedBy = [ "multi-user.target" "syslog.target" ]; wantedBy = [ "multi-user.target" ];
environment.TZ = config.time.timeZone; environment.TZ = config.time.timeZone;

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

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

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

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

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

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