diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-05-05 14:52:24 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-05-05 16:46:58 +0200 |
| commit | bac68f974721f07faebe749df8162f641e5d4528 (patch) | |
| tree | 7ef75e9cb08563533e28938313bc3cbb28108259 /nixos/modules/system/activation/switch-to-configuration.pl | |
| parent | d056d1d37b4c08dffadaea4d5f38a2dc8a7469fa (diff) | |
| download | nixlib-bac68f974721f07faebe749df8162f641e5d4528.tar nixlib-bac68f974721f07faebe749df8162f641e5d4528.tar.gz nixlib-bac68f974721f07faebe749df8162f641e5d4528.tar.bz2 nixlib-bac68f974721f07faebe749df8162f641e5d4528.tar.lz nixlib-bac68f974721f07faebe749df8162f641e5d4528.tar.xz nixlib-bac68f974721f07faebe749df8162f641e5d4528.tar.zst nixlib-bac68f974721f07faebe749df8162f641e5d4528.zip | |
switch-to-configuration: Honour RefuseManualStop
This prevents spurious errors about systemd-tmpfiles-setup.service. Backport: 14.04
Diffstat (limited to 'nixos/modules/system/activation/switch-to-configuration.pl')
| -rw-r--r-- | nixos/modules/system/activation/switch-to-configuration.pl | 2 |
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 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 |