about summary refs log tree commit diff
path: root/nixos/modules/system/activation
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2019-11-30 13:46:57 +0100
committerDomen Kožar <domen@dev.si>2019-11-30 13:46:57 +0100
commit0f799bd8a4483e230af407b9e6840262a017288c (patch)
tree66a886d91fc4290edb86b56c31460ac8cf20c82e /nixos/modules/system/activation
parentebe27d6503312c28ae67fc767fd88dafb4764475 (diff)
downloadnixlib-0f799bd8a4483e230af407b9e6840262a017288c.tar
nixlib-0f799bd8a4483e230af407b9e6840262a017288c.tar.gz
nixlib-0f799bd8a4483e230af407b9e6840262a017288c.tar.bz2
nixlib-0f799bd8a4483e230af407b9e6840262a017288c.tar.lz
nixlib-0f799bd8a4483e230af407b9e6840262a017288c.tar.xz
nixlib-0f799bd8a4483e230af407b9e6840262a017288c.tar.zst
nixlib-0f799bd8a4483e230af407b9e6840262a017288c.zip
Revert "nixos/switch-to-configuration: restart changed socket units"
This reverts commit 89806e95363f06869c9de18586e32c8ef65bd2fd.

See #74626
Diffstat (limited to 'nixos/modules/system/activation')
-rw-r--r--nixos/modules/system/activation/switch-to-configuration.pl12
1 files changed, 1 insertions, 11 deletions
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);