[PATCH] move execute_program to utils + add action to init_device

[elogind.git] / udev_add.c

diff --git a/udev_add.c b/udev_add.c
index bf5feb1b2d61cc387f03db5c768db98692b17470..d0d9eab913b21c4d00671e480d602dc1cadea0f6 100644 (file)
--- a/udev_add.c
+++ b/udev_add.c
@@ -42,7 +42,7 @@
 #include "udev_sysfs.h"
 #include "udev_version.h"
 #include "logging.h"
-#include "namedev.h"
+#include "udev_rules.h"
 #include "udev_db.h"
 #include "udev_selinux.h"
 
@@ -58,7 +58,7 @@ int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mo
        /* 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)) {
-               dbg("preserve file '%s', cause it has correct dev_t", file);
+               info("preserve file '%s', cause it has correct dev_t", file);
                selinux_setfilecon(file, udev->kernel_name, stats.st_mode);
                goto perms;
        }
@@ -85,7 +85,7 @@ create:
        retval = mknod(file, mode, devt);
        selinux_resetfscreatecon();
        if (retval != 0) {
-               dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
+               err("mknod(%s, %#o, %u, %u) failed with error '%s'",
                    file, mode, major(devt), minor(devt), strerror(errno));
                goto exit;
        }
@@ -150,7 +150,7 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
                if (endptr[0] == '\0')
                        gid = (gid_t) id;
                else
-                       gid = lookup_user(udev->group);
+                       gid = lookup_group(udev->group);
        }
 
        if (!udev->test_run) {
@@ -241,7 +241,7 @@ static int rename_net_if(struct udevice *udev)
        struct ifreq ifr;
        int retval;
 
-       dbg("changing net interface name from '%s' to '%s'", udev->kernel_name, udev->name);
+       info("changing net interface name from '%s' to '%s'", udev->kernel_name, udev->name);
        if (udev->test_run)
                return 0;
 
@@ -276,7 +276,7 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
                }
        }
 
-       if (namedev_name_device(udev, class_dev) != 0)
+       if (udev_rules_get_name(udev, class_dev) != 0)
                return 0;
 
        dbg("adding name='%s'", udev->name);