ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 12:22:37 +03:00
Code Issues Projects Releases Wiki Activity

* Fix a race condition in mountall: the USR1 signal handler must be

Browse Source 
installed before we daemonise, otherwise another job might send 
  USR1 to mountall before the handler is installed, killing it.

svn path=/nixpkgs/trunk/; revision=33289
This commit is contained in:
Eelco Dolstra 2012-03-20 10:25:11 +00:00
parent 42b97b78b0
commit 995a44a897
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/mountall/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1k52d4x75balnwcsqgznvzrdqgbp2dqnrzw0n25kajdcwr192wwy";
};
patches = [ ./no-plymouth.patch ];
patches = [ ./no-plymouth.patch ./fix-usr1-race.patch ];
preConfigure = "rm -R aclocal.m4; gettextize -f; autoreconf -vfi";

27
pkgs/os-specific/linux/mountall/fix-usr1-race.patch Normal file
View File

@ -0,0 +1,27 @@
diff -ru mountall-2.35-orig/src/mountall.c mountall-2.35/src/mountall.c
--- mountall-2.35-orig/src/mountall.c 2012-03-20 11:01:14.035898815 +0100
+++ mountall-2.35/src/mountall.c 2012-03-20 11:20:39.194786311 +0100
@@ -3746,6 +3746,12 @@
exit (EXIT_ERROR);
}
+ /* SIGUSR1 tells us that a network device came up. Install
+ the handler before daemonising so that the mountall-net job
+ won't kill us by sending USR1. */
+ nih_signal_set_handler (SIGUSR1, nih_signal_handler);
+ NIH_MUST (nih_signal_add_handler (NULL, SIGUSR1, usr1_handler, NULL));
+
/* Become daemon */
if (daemonise) {
pid_t pid;
@@ -3799,10 +3805,6 @@
nih_signal_set_handler (SIGTERM, nih_signal_handler);
NIH_MUST (nih_signal_add_handler (NULL, SIGTERM, nih_main_term_signal, NULL));
- /* SIGUSR1 tells us that a network device came up */
- nih_signal_set_handler (SIGUSR1, nih_signal_handler);
- NIH_MUST (nih_signal_add_handler (NULL, SIGUSR1, usr1_handler, NULL));
-
/* Check for force-fsck on the kernel command line */
cmdline = fopen ("/proc/cmdline", "r");
if (cmdline) {