[PATCH] simplify rules file by setting default mode to 0660

[elogind.git] / udev_utils.c

diff --git a/udev_utils.c b/udev_utils.c
index bdf0233e3ae1c5828f6cedc4acfea3463a227a58..0b730d565b666fd7f9f648a782de3d99d6b92d96 100644 (file)
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -36,8 +36,7 @@
 #include "list.h"
 
 
-void udev_set_values(struct udevice *udev, const char* devpath,
-                    const char *subsystem, const char* action)
+void udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem)
 {
        memset(udev, 0x00, sizeof(struct udevice));
 
@@ -45,8 +44,6 @@ void udev_set_values(struct udevice *udev, const char* devpath,
                strfieldcpy(udev->devpath, devpath);
        if (subsystem)
                strfieldcpy(udev->subsystem, subsystem);
-       if (action)
-               strfieldcpy(udev->action, action);
 
        if (strcmp(udev->subsystem, "block") == 0)
                udev->type = 'b';
@@ -58,6 +55,10 @@ void udev_set_values(struct udevice *udev, const char* devpath,
                udev->type = 'n';
        else if (strncmp(udev->devpath, "/class/", 7) == 0)
                udev->type = 'c';
+
+       udev->mode = default_mode;
+       strfieldcpy(udev->owner, default_owner);
+       strfieldcpy(udev->group, default_group);
 }
 
 int kernel_release_satisfactory(int version, int patchlevel, int sublevel)