diff options
| -rw-r--r-- | modules/services/logging/rsyslogd.nix | 2 | ||||
| -rw-r--r-- | modules/services/logging/syslogd.nix | 2 | ||||
| -rw-r--r-- | modules/services/system/dbus.nix | 1 | ||||
| -rw-r--r-- | modules/system/boot/systemd.nix | 8 |
4 files changed, 8 insertions, 5 deletions
diff --git a/modules/services/logging/rsyslogd.nix b/modules/services/logging/rsyslogd.nix index 7adc08d1a03..03fe50ab915 100644 --- a/modules/services/logging/rsyslogd.nix +++ b/modules/services/logging/rsyslogd.nix @@ -90,7 +90,7 @@ in requires = [ "syslog.socket" ]; - wantedBy = [ "multi-user.target" "syslog.target" ]; + wantedBy = [ "multi-user.target" ]; environment.TZ = config.time.timeZone; diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix index 886669606b4..c45b533112a 100644 --- a/modules/services/logging/syslogd.nix +++ b/modules/services/logging/syslogd.nix @@ -110,7 +110,7 @@ in requires = [ "syslog.socket" ]; - wantedBy = [ "multi-user.target" "syslog.target" ]; + wantedBy = [ "multi-user.target" ]; environment.TZ = config.time.timeZone; diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix index 4a9d9a77b57..28647004ce4 100644 --- a/modules/services/system/dbus.nix +++ b/modules/services/system/dbus.nix @@ -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 diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix index 9534e382c92..dabb6f6661b 100644 --- a/modules/system/boot/systemd.nix +++ b/modules/system/boot/systemd.nix @@ -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: |