X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_add.c;h=128917e519db9457720fdca27c15ebc9ca32a76c;hb=f3aef1a78eeb80f9234eb39d22965ad1f6e94b5d;hp=a811b5a17c17eb0fcec54d7ebab752db2ae87c1f;hpb=ff3e4bed21aaff673284f2e024da26c1e39cfda6;p=elogind.git

diff --git a/udev_add.c b/udev_add.c
index a811b5a17..128917e51 100644
--- a/udev_add.c
+++ b/udev_add.c
@@ -37,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"
 
 
@@ -73,7 +71,7 @@ int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mo
 	}
 
 	if (unlink(file) != 0)
-		dbg("unlink(%s) failed: %s", file, strerror(errno));
+		err("unlink(%s) failed: %s", file, strerror(errno));
 	else
 		dbg("already present file '%s' unlinked", file);
 
@@ -90,14 +88,14 @@ create:
 perms:
 	dbg("chmod(%s, %#o)", file, mode);
 	if (chmod(file, mode) != 0) {
-		dbg("chmod(%s, %#o) failed: %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: %s",
+			err("chown(%s, %u, %u) failed: %s",
 			    file, uid, gid, strerror(errno));
 			goto exit;
 		}
@@ -222,7 +220,7 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
 			retval = symlink(linktarget, filename);
 			selinux_resetfscreatecon();
 			if (retval != 0)
-				dbg("symlink(%s, %s) failed: %s",
+				err("symlink(%s, %s) failed: %s",
 				    linktarget, filename, strerror(errno));
 		}
 	}
@@ -244,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: %s", strerror(errno));
+		err("error opening socket: %s", strerror(errno));
 		return -1;
 	}
 
@@ -254,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: %s", strerror(errno));
+		err("error changing net interface name: %s", strerror(errno));
 	close(sk);
 
 	return retval;