Skip to content

Commit 125edf8

Browse files
committed
switch-to-configuration: don't block on flock, see 7a56dda
1 parent 7a56dda commit 125edf8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

nixos/modules/system/activation/switch-to-configuration.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595

9696
make_path("/run/nixos", { mode => oct(755) });
9797
open(my $stc_lock, '>>', '/run/nixos/switch-to-configuration.lock') or die "Could not open lock - $!";
98-
flock($stc_lock, LOCK_EX) or die "Could not acquire lock - $!";
98+
flock($stc_lock, LOCK_EX|LOCK_NB) or die "Could not acquire lock - $!";
9999
openlog("nixos", "", LOG_USER);
100100

101101
# run pre-switch checks

0 commit comments

Comments
 (0)