diff options
author | Janne Heß <janne@hess.ooo> | 2021-12-05 18:46:50 +0100 |
---|---|---|
committer | Janne Heß <janne@hess.ooo> | 2021-12-05 18:46:50 +0100 |
commit | 1e422e7d58a7121c3752fcda2c00b09bf11edae9 (patch) | |
tree | 254648493403a06dbe58e8c0c7c5256ec68dfae3 /nixos/modules/system/activation | |
parent | 3693e8b0939d748781581094d766a85774b9f6ec (diff) | |
download | nixpkgs-1e422e7d58a7121c3752fcda2c00b09bf11edae9.tar nixpkgs-1e422e7d58a7121c3752fcda2c00b09bf11edae9.tar.gz nixpkgs-1e422e7d58a7121c3752fcda2c00b09bf11edae9.tar.bz2 nixpkgs-1e422e7d58a7121c3752fcda2c00b09bf11edae9.tar.lz nixpkgs-1e422e7d58a7121c3752fcda2c00b09bf11edae9.tar.xz nixpkgs-1e422e7d58a7121c3752fcda2c00b09bf11edae9.tar.zst nixpkgs-1e422e7d58a7121c3752fcda2c00b09bf11edae9.zip |
nixos/switch-to-configuration: Fix dry order
This makes the order of the dry activation messages the same as the real actions which makes more sense than another random order.
Diffstat (limited to 'nixos/modules/system/activation')
-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 ff63304776b..8a3b6a225c0 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -381,12 +381,12 @@ if ($action eq "dry-activate") { split('\n', read_file($dryReloadByActivationFile, err_mode => 'quiet') // ""); print STDERR "would restart systemd\n" if $restartSystemd; + print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n" + if scalar(keys %unitsToReload) > 0; print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n" if scalar(keys %unitsToRestart) > 0; print STDERR "would start the following units: ", join(", ", @unitsToStartFiltered), "\n" if scalar @unitsToStartFiltered; - print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n" - if scalar(keys %unitsToReload) > 0; unlink($dryRestartByActivationFile); unlink($dryReloadByActivationFile); exit 0; |