diff options
| author | adisbladis <adisbladis@gmail.com> | 2020-03-10 11:17:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 11:17:33 +0000 |
| commit | 6fcce60fd55469986a99954c0f120146f4289cd2 (patch) | |
| tree | cf3c4ae7bc2ad6b4dd2bbc593cd9e32e76cad1ee /nixos | |
| parent | c3267ac41401aacf37fbebd641e62184add89416 (diff) | |
| parent | db6c94304f3186b2e09abfd01f8c485b7886e0c4 (diff) | |
| download | nixpkgs-6fcce60fd55469986a99954c0f120146f4289cd2.tar nixpkgs-6fcce60fd55469986a99954c0f120146f4289cd2.tar.gz nixpkgs-6fcce60fd55469986a99954c0f120146f4289cd2.tar.bz2 nixpkgs-6fcce60fd55469986a99954c0f120146f4289cd2.tar.lz nixpkgs-6fcce60fd55469986a99954c0f120146f4289cd2.tar.xz nixpkgs-6fcce60fd55469986a99954c0f120146f4289cd2.tar.zst nixpkgs-6fcce60fd55469986a99954c0f120146f4289cd2.zip | |
Merge pull request #82139 from adisbladis/switch-to-configuration-manual
switch-to-configuration: Add new option X-OnlyManualStart
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/activation/switch-to-configuration.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 641cf9faadc..b82d69b3bb8 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -183,7 +183,7 @@ while (my ($unit, $state) = each %{$activePrev}) { # active after the system has resumed, which probably # should not be the case. Just ignore it. if ($unit ne "suspend.target" && $unit ne "hibernate.target" && $unit ne "hybrid-sleep.target") { - unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "no")) { + unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "no") || boolIsTrue($unitInfo->{'X-OnlyManualStart'} // "no")) { $unitsToStart{$unit} = 1; recordUnit($startListFile, $unit); # Don't spam the user with target units that always get started. @@ -222,7 +222,7 @@ while (my ($unit, $state) = each %{$activePrev}) { $unitsToReload{$unit} = 1; recordUnit($reloadListFile, $unit); } - elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") ) { + elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") || boolIsTrue($unitInfo->{'X-OnlyManualStart'} // "no")) { $unitsToSkip{$unit} = 1; } else { if (!boolIsTrue($unitInfo->{'X-StopIfChanged'} // "yes")) { |