===== Makefile 1.103 vs edited ===== --- 1.103/Makefile Thu Feb 5 02:41:19 2004 +++ edited/Makefile Fri Feb 6 01:39:07 2004 @@ -241,7 +241,6 @@ @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 ===== udev-remove.c 1.17 vs edited ===== --- 1.17/udev-remove.c Thu Jan 15 16:22:25 2004 +++ edited/udev-remove.c Fri Feb 6 01:24:11 2004 @@ -34,7 +34,6 @@ #include "logging.h" #include "namedev.h" #include "udevdb.h" -#include "libsysfs/libsysfs.h" static int delete_path(char *path) { ===== udevd.c 1.13 vs edited ===== --- 1.13/udevd.c Thu Feb 5 10:32:51 2004 +++ edited/udevd.c Fri Feb 6 01:37:52 2004 @@ -21,7 +21,6 @@ #include #include -#include #include #include #include @@ -30,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -324,7 +322,6 @@ switch (signum) { case SIGINT: case SIGTERM: - unlink(UDEVD_LOCK); exit(20 + signum); break; default: @@ -332,28 +329,6 @@ } } -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; @@ -368,10 +343,6 @@ int retval; 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);