summary refs log tree commit diff
diff options
context:
space:
mode:
authorLuca Bruno <lethalman88@gmail.com>2015-01-14 16:02:39 +0100
committerLuca Bruno <lethalman88@gmail.com>2015-01-14 16:08:47 +0100
commit2beb43174f6c92862534868e8959f2800c41ce1e (patch)
tree9d628eb3b4fb836ded4f11ba07b74f1363db2c00
parentc2f8791e832bc5aabfc10df487c6776704530a3a (diff)
nixos-rebuild: use reload-or-restart for dbus. Closes #5767
Now that dbus reload has been moved before restarting units,
the reload may fail if dbus has been stopped before.
The reload-or-restart will reload dbus if it's active,
otherwise start it.
-rw-r--r--nixos/modules/system/activation/switch-to-configuration.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index c814469ae41df..dbe13c022f09e 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -323,7 +323,7 @@ system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3;
 
 # Signal dbus to reload its configuration before starting other units.
 # Other units may rely on newly installed policy files under /etc/dbus-1
-system("@systemd@/bin/systemctl", "reload", "dbus.service");
+system("@systemd@/bin/systemctl", "reload-or-restart", "dbus.service");
 
 # Restart changed services (those that have to be restarted rather
 # than stopped and started).