picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[PATCH] udevd - kill the lockfile

This commit is contained in:
kay.sievers@vrfy.org 2004-02-06 01:04:28 -08:00 committed by Greg KH
parent aca29aa51f
commit d2cf99df7d
3 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -241,7 +241,6 @@ udev_version.h:
@echo \#define UDEV_PERMISSION_FILE \"$(configdir)\udev.permissions\" >> $@
@echo \#define UDEV_BIN \"$(DESTDIR)$(sbindir)/udev\" >> $@
@echo \#define UDEVD_BIN \"$(DESTDIR)$(sbindir)/udevd\" >> $@
@echo \#define UDEVD_LOCK \"$(udevdir)/\.udevd.lock\" >> $@
# config files automatically generated
GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf

1
udev-remove.c
View File

@ -34,7 +34,6 @@
#include "logging.h"
#include "namedev.h"
#include "udevdb.h"
#include "libsysfs/libsysfs.h"
static int delete_path(char *path)
{

29
udevd.c
View File

@ -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);