diff options
| author | Janne Heß <janne@hess.ooo> | 2021-12-05 18:43:42 +0100 |
|---|---|---|
| committer | Janne Heß <janne@hess.ooo> | 2021-12-05 18:43:42 +0100 |
| commit | 50a0f33c2a8dd896981d43fd7a6a4edbb5ed7d06 (patch) | |
| tree | 095a8487fbd8391714f7156536d1560a7f269646 /nixos/modules/system/activation | |
| parent | 3f47d85f942b9cece1b28c106f60e7ecef7d261d (diff) | |
| download | nixpkgs-50a0f33c2a8dd896981d43fd7a6a4edbb5ed7d06.tar nixpkgs-50a0f33c2a8dd896981d43fd7a6a4edbb5ed7d06.tar.gz nixpkgs-50a0f33c2a8dd896981d43fd7a6a4edbb5ed7d06.tar.bz2 nixpkgs-50a0f33c2a8dd896981d43fd7a6a4edbb5ed7d06.tar.lz nixpkgs-50a0f33c2a8dd896981d43fd7a6a4edbb5ed7d06.tar.xz nixpkgs-50a0f33c2a8dd896981d43fd7a6a4edbb5ed7d06.tar.zst nixpkgs-50a0f33c2a8dd896981d43fd7a6a4edbb5ed7d06.zip | |
nixos/switch-to-configuration: Remove unnecessary TODOs
The first one doesn't make any sense because the directory where the init binary resides does not contain other tools we need like systemd-escape. The second one doesn't make sense either because the errors are already ignored.
Diffstat (limited to 'nixos/modules/system/activation')
| -rw-r--r-- | nixos/modules/system/activation/switch-to-configuration.pl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 053496441d8..9fdc5c4a13a 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -11,7 +11,6 @@ use Cwd 'abs_path'; my $out = "@out@"; -# FIXME: maybe we should use /proc/1/exe to get the current systemd. my $curSystemd = abs_path("/run/current-system/sw/bin"); # To be robust against interruption, record what units need to be started etc. @@ -400,7 +399,7 @@ if (scalar (keys %unitsToStop) > 0) { print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n" if scalar @unitsToStopFiltered; # Use current version of systemctl binary before daemon is reexeced. - system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors? + system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop)); } print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" |