From bac68f974721f07faebe749df8162f641e5d4528 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 May 2014 14:52:24 +0200 Subject: [PATCH] switch-to-configuration: Honour RefuseManualStop This prevents spurious errors about systemd-tmpfiles-setup.service. Backport: 14.04 --- nixos/modules/system/activation/switch-to-configuration.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 7bce06cf3b5a..12012698efe3 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -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