X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_add.c;h=174474bdc703a1bf0e6adb966979afd5b0635653;hp=2081e503c7d33d8eb5f0cee4cbd0f09684665ef3;hb=c602535043cbe74dfdcc5f2926e8518237602694;hpb=c07669bd663d780e4957691e488798aa0178e76b

diff --git a/udev_add.c b/udev_add.c
index 2081e503c..174474bdc 100644
--- a/udev_add.c
+++ b/udev_add.c
@@ -1,10 +1,8 @@
 /*
  * udev-add.c
  *
- * Userspace devfs
- *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -39,11 +37,9 @@
 #include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "udev_utils.h"
-#include "udev_sysfs.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "udev_rules.h"
-#include "udev_db.h"
 #include "udev_selinux.h"
 
 
@@ -52,40 +48,39 @@ int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mo
 	struct stat stats;
 	int retval = 0;
 
+	switch (udev->type) {
+	case DEV_BLOCK:
+		mode |= S_IFBLK;
+		break;
+	case DEV_CLASS:
+		mode |= S_IFCHR;
+		break;
+	default:
+		dbg("unknown node type %c\n", udev->type);
+		return -EINVAL;
+	}
+
 	if (stat(file, &stats) != 0)
 		goto create;
 
 	/* preserve node with already correct numbers, to not change the inode number */
-	if (((stats.st_mode & S_IFMT) == S_IFBLK || (stats.st_mode & S_IFMT) == S_IFCHR) &&
-	    (stats.st_rdev == devt)) {
+	if ((stats.st_mode & S_IFMT) == (mode & S_IFMT) && (stats.st_rdev == devt)) {
 		info("preserve file '%s', cause it has correct dev_t", file);
 		selinux_setfilecon(file, udev->kernel_name, stats.st_mode);
 		goto perms;
 	}
 
 	if (unlink(file) != 0)
-		dbg("unlink(%s) failed with error '%s'", file, strerror(errno));
+		err("unlink(%s) failed: %s", file, strerror(errno));
 	else
 		dbg("already present file '%s' unlinked", file);
 
 create:
-	switch (udev->type) {
-	case DEV_BLOCK:
-		mode |= S_IFBLK;
-		break;
-	case DEV_CLASS:
-		mode |= S_IFCHR;
-		break;
-	default:
-		dbg("unknown node type %c\n", udev->type);
-		return -EINVAL;
-	}
-
 	selinux_setfscreatecon(file, udev->kernel_name, mode);
 	retval = mknod(file, mode, devt);
 	selinux_resetfscreatecon();
 	if (retval != 0) {
-		err("mknod(%s, %#o, %u, %u) failed with error '%s'",
+		err("mknod(%s, %#o, %u, %u) failed: %s",
 		    file, mode, major(devt), minor(devt), strerror(errno));
 		goto exit;
 	}
@@ -93,14 +88,14 @@ create:
 perms:
 	dbg("chmod(%s, %#o)", file, mode);
 	if (chmod(file, mode) != 0) {
-		dbg("chmod(%s, %#o) failed with error '%s'", file, mode, strerror(errno));
+		err("chmod(%s, %#o) failed: %s", file, mode, strerror(errno));
 		goto exit;
 	}
 
 	if (uid != 0 || gid != 0) {
 		dbg("chown(%s, %u, %u)", file, uid, gid);
 		if (chown(file, uid, gid) != 0) {
-			dbg("chown(%s, %u, %u) failed with error '%s'",
+			err("chown(%s, %u, %u) failed: %s",
 			    file, uid, gid, strerror(errno));
 			goto exit;
 		}
@@ -218,14 +213,14 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
 
 		strlcat(linktarget, &udev->name[tail], sizeof(linktarget));
 
-		dbg("symlink(%s, %s)", linktarget, filename);
+		info("creating symlink '%s' to '%s'", filename, linktarget);
 		if (!udev->test_run) {
 			unlink(filename);
 			selinux_setfscreatecon(filename, NULL, S_IFLNK);
 			retval = symlink(linktarget, filename);
 			selinux_resetfscreatecon();
 			if (retval != 0)
-				dbg("symlink(%s, %s) failed with error '%s'",
+				err("symlink(%s, %s) failed: %s",
 				    linktarget, filename, strerror(errno));
 		}
 	}
@@ -247,7 +242,7 @@ static int rename_net_if(struct udevice *udev)
 
 	sk = socket(PF_INET, SOCK_DGRAM, 0);
 	if (sk < 0) {
-		dbg("error opening socket");
+		err("error opening socket: %s", strerror(errno));
 		return -1;
 	}
 
@@ -257,7 +252,7 @@ static int rename_net_if(struct udevice *udev)
 
 	retval = ioctl(sk, SIOCSIFNAME, &ifr);
 	if (retval != 0)
-		dbg("error changing net interface name");
+		err("error changing net interface name: %s", strerror(errno));
 	close(sk);
 
 	return retval;
@@ -277,8 +272,7 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
 			goto exit;
 
 		if (udev_db_add_device(udev) != 0)
-			dbg("udev_db_add_dev failed, but we create the node anyway, "
-			    "remove might not work for custom names");
+			dbg("udev_db_add_dev failed, remove might not work for custom names");
 
 		/* use full path to the environment */
 		snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
@@ -291,6 +285,7 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
 			if (retval != 0)
 				goto exit;
 
+			info("renamed netif to '%s'", udev->name);
 			/* we've changed the name, now fake the devpath, cause the
 			 * original kernel name sleeps with the fishes and we don't
 			 * get an event from the kernel with the new name
@@ -299,6 +294,7 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
 			if (pos != NULL) {
 				pos[1] = '\0';
 				strlcat(udev->devpath, udev->name, sizeof(udev->devpath));
+				strlcpy(udev->kernel_name, udev->name, sizeof(udev->kernel_name));
 				setenv("DEVPATH", udev->devpath, 1);
 				setenv("INTERFACE", udev->name, 1);
 			}