movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/switch-to-configuration: don't try restart deleted sockets

Browse source
This commit is contained in:
Jean-Baptiste Giraudeau 2021-03-11 11:09:50 +01:00
parent 3175628b30
commit 77b7d29bf8
No known key found for this signature in database
GPG key ID: 7CEF8C9CC2D9933B
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/system/activation/switch-to-configuration.pl
View file

@ -243,9 +243,13 @@ while (my ($unit, $state) = each %{$activePrev}) {
foreach my $socket (@sockets) { foreach my $socket (@sockets) {
if (defined $activePrev->{$socket}) { if (defined $activePrev->{$socket}) {
$unitsToStop{$socket} = 1; $unitsToStop{$socket} = 1;
$unitsToStart{$socket} = 1; # Only restart sockets that actually
recordUnit($startListFile, $socket); # exist in new configuration:
$socketActivated = 1; if (-e "$out/etc/systemd/system/$socket") {
$unitsToStart{$socket} = 1;
recordUnit($startListFile, $socket);
$socketActivated = 1;
}
} }
} }
} }