X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=3ce8c8b07dbe56003f80324bb84aec66cfc4d980;hp=10d67f2c359995c861ecb94a554d855b14852b00;hb=d2cf99df7df132d8d90c4f7b438374618793c15a;hpb=aca29aa51f0c8dfb1e6b8d60471d4034b65effb5

diff --git a/udevd.c b/udevd.c
index 10d67f2c3..3ce8c8b07 100644
--- a/udevd.c
+++ b/udevd.c
@@ -21,7 +21,6 @@
 
 #include <pthread.h>
 #include <stddef.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <signal.h>
 #include <unistd.h>
@@ -30,7 +29,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -324,7 +322,6 @@ static void sig_handler(int signum)
 	switch (signum) {
 		case SIGINT:
 		case SIGTERM:
-			unlink(UDEVD_LOCK);
 			exit(20 + signum);
 			break;
 		default:
@@ -332,28 +329,6 @@ static void sig_handler(int signum)
 	}
 }
 
-static int one_and_only(void)
-{
-	char string[50];
-	int lock_file;
-
-	lock_file = open(UDEVD_LOCK, O_RDWR | O_CREAT, 0x640);
-	if (lock_file < 0)
-		return -1;
-
-	/* see if we can lock */
-	if (lockf(lock_file, F_TLOCK, 0) < 0) {
-		dbg("file is already locked, exit");
-		close(lock_file);
-		return -1;
-	}
-
-	snprintf(string, sizeof(string), "%d\n", getpid());
-	write(lock_file, string, strlen(string));
-
-	return 0;
-}
-
 int main(int argc, char *argv[])
 {
 	int ssock;
@@ -369,10 +344,6 @@ int main(int argc, char *argv[])
 
 	init_logging("udevd");
 
-	/* only let one version of the daemon run at any one time */
-	if (one_and_only() != 0)
-		exit(0);
-
 	signal(SIGINT, sig_handler);
 	signal(SIGTERM, sig_handler);