From 0f799bd8a4483e230af407b9e6840262a017288c Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Sat, 30 Nov 2019 13:46:57 +0100 Subject: Revert "nixos/switch-to-configuration: restart changed socket units" This reverts commit 89806e95363f06869c9de18586e32c8ef65bd2fd. See #74626 --- nixos/modules/system/activation/switch-to-configuration.pl | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'nixos/modules/system/activation') diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 12a80a12d19f..641cf9faadc9 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -214,17 +214,7 @@ while (my ($unit, $state) = each %{$activePrev}) { # Reload the changed mount unit to force a remount. $unitsToReload{$unit} = 1; recordUnit($reloadListFile, $unit); - } elsif ($unit =~ /\.socket$/) { - my $unitInfo = parseUnit($newUnitFile); - # If a socket unit has been changed, the corresponding - # service unit has to be stopped before the socket can - # be restarted. The service will be started again on demand. - my $serviceUnit = $unitInfo->{'Unit'} // "$baseName.service"; - $unitsToStop{$serviceUnit} = 1; - $unitsToStop{$unit} = 1; - $unitsToStart{$unit} = 1; - recordUnit($startListFile, $unit); - } elsif ($unit =~ /\.path$/ || $unit =~ /\.slice$/) { + } elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/ || $unit =~ /\.slice$/) { # FIXME: do something? } else { my $unitInfo = parseUnit($newUnitFile); -- cgit 1.4.1