diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-14 12:01:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-14 12:01:26 +0000 |
| commit | 0ed928e4aba48923f8a198c53ab445fbf8bd06c4 (patch) | |
| tree | 0f86a4ebbd96dc9a60ac4bafa12c3ee115d3a90c /nixos/modules/system/activation/switch-to-configuration.pl | |
| parent | 0737c221adbd17c7319976b4fad8840dda2f88bd (diff) | |
| parent | 1a268c42c8b0550f70da78c136171799481b0d97 (diff) | |
| download | nixlib-0ed928e4aba48923f8a198c53ab445fbf8bd06c4.tar nixlib-0ed928e4aba48923f8a198c53ab445fbf8bd06c4.tar.gz nixlib-0ed928e4aba48923f8a198c53ab445fbf8bd06c4.tar.bz2 nixlib-0ed928e4aba48923f8a198c53ab445fbf8bd06c4.tar.lz nixlib-0ed928e4aba48923f8a198c53ab445fbf8bd06c4.tar.xz nixlib-0ed928e4aba48923f8a198c53ab445fbf8bd06c4.tar.zst nixlib-0ed928e4aba48923f8a198c53ab445fbf8bd06c4.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/system/activation/switch-to-configuration.pl')
| -rwxr-xr-x[-rw-r--r--] | nixos/modules/system/activation/switch-to-configuration.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 07ee281feec1..459d09faa53b 100644..100755 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -67,7 +67,10 @@ openlog("nixos", "", LOG_USER); # Install or update the bootloader. if ($action eq "switch" || $action eq "boot") { - system('@installBootLoader@', $out) == 0 or exit 1; + chomp(my $installBootLoader = <<'EOFBOOTLOADER'); +@installBootLoader@ +EOFBOOTLOADER + system("$installBootLoader $out") == 0 or exit 1; } # Just in case the new configuration hangs the system, do a sync now. |