remove default settings in udev.conf

[elogind.git] / udev_add.c

diff --git a/udev_add.c b/udev_add.c
index e9ae150180f56675bad3d1618e62833060344cd8..174474bdc703a1bf0e6adb966979afd5b0635653 100644 (file)
--- 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"
 
 
@@ -75,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 with error '%s'", file, strerror(errno));
+               err("unlink(%s) failed: %s", file, strerror(errno));
        else
                dbg("already present file '%s' unlinked", file);
 
@@ -84,7 +80,7 @@ create:
        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;
        }
@@ -92,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;
                }
@@ -217,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));
                }
        }
@@ -246,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;
        }
 
@@ -256,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;
@@ -276,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);