public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos-rebuild: reload dbus before starting other units. Closes #4546

Browse Source
This commit is contained in:
Luca Bruno 2014-11-02 23:02:45 +01:00 committed by Aristid Breitkreuz
parent 8b949e5ff5
commit 510fba95e8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/system/activation/switch-to-configuration.pl
View File

@ -321,6 +321,10 @@ system("@systemd@/bin/systemctl", "reset-failed");
# Make systemd reload its units. # Make systemd reload its units.
system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3; 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");
# Restart changed services (those that have to be restarted rather # Restart changed services (those that have to be restarted rather
# than stopped and started). # than stopped and started).
my @restart = unique(split('\n', read_file($restartListFile, err_mode => 'quiet') // "")); my @restart = unique(split('\n', read_file($restartListFile, err_mode => 'quiet') // ""));
@ -350,8 +354,6 @@ if (scalar @reload > 0) {
unlink($reloadListFile); unlink($reloadListFile);
} }
# Signal dbus to reload its configuration.
system("@systemd@/bin/systemctl", "reload", "dbus.service");
# Print failed and new units. # Print failed and new units.
my (@failed, @new, @restarting); my (@failed, @new, @restarting);