movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

switch-to-configuration: Honour RefuseManualStop

Browse source 
This prevents spurious errors about systemd-tmpfiles-setup.service.

Backport: 14.04
This commit is contained in:
Eelco Dolstra 2014-05-05 14:52:24 +02:00
parent d056d1d37b
commit bac68f9747
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/system/activation/switch-to-configuration.pl
View file

@ -188,7 +188,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
if (boolIsTrue($unitInfo->{'X-ReloadIfChanged'} // "no")) {
write_file($reloadListFile, { append => 1 }, "$unit\n");
}
elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes")) {
elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") ) {
push @unitsToSkip, $unit;
} else {
# If this unit is socket-activated, then stop the