switch-to-configuration: Better error checking

2015-04-13 12:28:12 +02:00
parent 6fba1d8628
commit 4466707ddf
1 changed files with 3 additions and 1 deletions
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -322,7 +322,9 @@ foreach my $device (keys %$prevSwaps) {


 # Should we have systemd re-exec itself?
-my $restartSystemd = abs_path("/proc/1/exe") ne abs_path("@systemd@/lib/systemd/systemd");
+my $prevSystemd = abs_path("/proc/1/exe") or die;
+my $newSystemd = abs_path("@systemd@/lib/systemd/systemd") or die;
+my $restartSystemd = $prevSystemd ne $newSystemd;


 sub filterUnits {