[SSI] openssi/udev Makefile, 1.1.15.1.2.1, 1.1.15.1.2.2 udevd.c, 1.1.15.2.2.1, 1.1.15.2.2.2 udevd.h, 1.1.15.2.2.1, 1.1.15.2.2.2

Update of /cvsroot/ssic-linux/openssi/udev
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22320

Modified Files:
      Tag: OPENSSI-CENTOS
	Makefile udevd.c udevd.h 
Log Message:
Move UDEV_SETTLE_FILE and UDEVD_SOCK_PATH from /var/run to /dev. Root filesystem is read-only during init, so `udevsettle` won't work and in OpenSSI udevd bind(2) fails.


Index: Makefile
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/udev/Makefile,v
retrieving revision 1.1.15.1.2.1
retrieving revision 1.1.15.1.2.2
diff -u -d -r1.1.15.1.2.1 -r1.1.15.1.2.2
--- Makefile	12 Jul 2010 06:10:18 -0000	1.1.15.1.2.1
+++ Makefile	14 Sep 2010 03:52:11 -0000	1.1.15.1.2.2
@@ -260,7 +260,7 @@
 	@echo \#define UDEV_VERSION		\"$(VERSION)\" > $@
 	@echo \#define UDEV_ROOT		\"$(udevdir)/\" >> $@
 	@echo \#define UDEV_DB			\"$(udevdir)/.udev.tdb\" >> $@
-	@echo \#define UDEV_SETTLE_FILE		\"/var/run/.udevsettle\" >> $@
+	@echo \#define UDEV_SETTLE_FILE		\"$(udevdir)/.udevsettle\" >> $@
 	@echo \#define UDEV_CONFIG_DIR		\"$(configdir)\" >> $@
 	@echo \#define UDEV_CONFIG_FILE		\"$(configdir)/udev.conf\" >> $@
 	@echo \#define UDEV_RULES_FILE		\"$(configdir)/rules.d\" >> $@

Index: udevd.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/udev/udevd.c,v
retrieving revision 1.1.15.2.2.1
retrieving revision 1.1.15.2.2.2
diff -u -d -r1.1.15.2.2.1 -r1.1.15.2.2.2
--- udevd.c	12 Jul 2010 06:10:18 -0000	1.1.15.2.2.1
+++ udevd.c	14 Sep 2010 03:52:11 -0000	1.1.15.2.2.2
@@ -654,7 +654,6 @@
 
 	/* Clean up stale files */
 	unlink(UDEVD_SOCK_PATH);
-	unlink(UDEV_SETTLE_FILE);
 
 	/* the bind takes care of ensuring only one copy running */
 	retval = bind(ssock, (struct sockaddr *) &saddr, addrlen);

Index: udevd.h
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/udev/udevd.h,v
retrieving revision 1.1.15.2.2.1
retrieving revision 1.1.15.2.2.2
diff -u -d -r1.1.15.2.2.1 -r1.1.15.2.2.2
--- udevd.h	12 Jul 2010 06:10:18 -0000	1.1.15.2.2.1
+++ udevd.h	14 Sep 2010 03:52:11 -0000	1.1.15.2.2.2
@@ -27,7 +27,7 @@
 #define UDEV_MAGIC			"udevd_" UDEV_VERSION
 #define EVENT_TIMEOUT_SEC		10
 #define UDEVSEND_CONNECT_RETRY		20 /* x 100 millisec */
-#define UDEVD_SOCK_PATH			"/var/run/udevd_sock"
+#define UDEVD_SOCK_PATH			"/dev/udevd.sock"
 
 /* maximum limit of forked childs */
 #define UDEVD_MAX_CHILDS                256


------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev