X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-add.c;h=802d85b5b07d408fe612b41398b2416abc061a73;hb=e68faf511dd9be15a27042d1828460d3655707d8;hp=2f72613ea9fca7918b77908fd413e7d1d357cbde;hpb=0529e2ed2eb1ccfd28d2cd33ce759f9c7b9bc0ff;p=elogind.git

diff --git a/udev-add.c b/udev-add.c
index 2f72613ea..802d85b5b 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -100,6 +100,7 @@ static int create_path(char *file)
 
 static int create_node(struct udevice *dev)
 {
+	struct stat stats;
 	char filename[255];
 	char linktarget[255];
 	char *linkname;
@@ -221,6 +222,16 @@ static int create_node(struct udevice *dev)
 				strcpy(linktarget, "./");
 			strcat(linktarget, &dev->name[tail]);
 
+			/* unlink existing non-directories to ensure that our symlink
+			 * is created */
+			if (lstat(filename, &stats) == 0) {
+				if ((stats.st_mode & S_IFMT) != S_IFDIR) {
+					if (unlink(filename))
+						dbg("unlink(%s) failed with error '%s'",
+						    filename, strerror(errno));
+				}
+			}
+
 			dbg("symlink(%s, %s)", linktarget, filename);
 			retval = symlink(linktarget, filename);
 			if (retval)