let "ignore_device" always return the event successfully

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

diff --git a/udev.c b/udev.c
index 6387d0b14e89a0423fac682108cff609867b036b..17ab635f1ea07dd91eacbf046742d890f907c6e9 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -154,7 +154,7 @@ int main(int argc, char *argv[], char *envp[])
 
        retval = udev_device_event(&rules, udev);
 
 
        retval = udev_device_event(&rules, udev);
 

-       if (!retval && udev_run && !list_empty(&udev->run_list)) {
+       if (retval == 0 && !udev->ignore_device && udev_run) {

                struct name_entry *name_loop;
 
                dbg("executing run list");
                struct name_entry *name_loop;
 
                dbg("executing run list");


@@ -178,5 +178,7 @@ fail:
 
 exit:
        logging_close();
 
 exit:
        logging_close();

-       return retval;
+       if (retval != 0)
+               return 1;
+       return 0;

 }
 }

diff --git a/udev_device.c b/udev_device.c
index 781787ef4ac5149e404842aa7b6830695a72b789..5db27093d4316d6d6a9cce6668499d6e1064080d 100644 (file)
--- a/udev_device.c
+++ b/udev_device.c
@@ -88,14 +88,14 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
                udev_rules_get_name(rules, udev);
                if (udev->ignore_device) {
                        info("device event will be ignored");
                udev_rules_get_name(rules, udev);
                if (udev->ignore_device) {
                        info("device event will be ignored");

-                       return -1;
+                       return 0;

                }
                /* create node, store in db */
                if (udev->name[0] != '\0')
                        retval = udev_add_device(udev);
                else
                        info("device node creation supressed");
                }
                /* create node, store in db */
                if (udev->name[0] != '\0')
                        retval = udev_add_device(udev);
                else
                        info("device node creation supressed");

-               return 0;
+               return retval;

        }
 
        if (major(udev->devt) != 0 && strcmp(udev->action, "remove") == 0) {
        }
 
        if (major(udev->devt) != 0 && strcmp(udev->action, "remove") == 0) {


@@ -104,7 +104,7 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
                udev_rules_get_run(rules, udev);
                if (udev->ignore_device) {
                        info("device event will be ignored");
                udev_rules_get_run(rules, udev);
                if (udev->ignore_device) {
                        info("device event will be ignored");

-                       return -1;
+                       return 0;

                }
                /* get data from db, remove db-entry, delete node */
                retval = udev_remove_device(udev);
                }
                /* get data from db, remove db-entry, delete node */
                retval = udev_remove_device(udev);


@@ -112,15 +112,13 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
                /* restore stored persistent data */
                list_for_each_entry(name_loop, &udev->env_list, node)
                        putenv(name_loop->name);
                /* restore stored persistent data */
                list_for_each_entry(name_loop, &udev->env_list, node)
                        putenv(name_loop->name);

-               return 0;
+               return retval;

        }
 
        }
 

-       /* default devices */
+       /* default devices without a node */

        udev_rules_get_run(rules, udev);
        udev_rules_get_run(rules, udev);

-       if (udev->ignore_device) {
+       if (udev->ignore_device)

                info("device event will be ignored");
                info("device event will be ignored");

-               return -1;
-       }

 
        return retval;
 }
 
        return retval;
 }

diff --git a/udevd.c b/udevd.c
index 4ed2f94bfc50c0a0f3d51dcc3b612c2b03b663ab..c94fdc74d8ed4fc5c85a66e489fd26cc9116c170 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -117,9 +117,10 @@ static int udev_event_process(struct uevent_msg *msg)
        retval = udev_device_event(&rules, udev);
 
        /* run programs collected by RUN-key*/
        retval = udev_device_event(&rules, udev);
 
        /* run programs collected by RUN-key*/

-       if (retval == 0) {
+       if (retval == 0 && !udev->ignore_device && udev_run) {

                struct name_entry *name_loop;
 
                struct name_entry *name_loop;
 

+               dbg("executing run list");

                list_for_each_entry(name_loop, &udev->run_list, node) {
                        if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
                                pass_env_to_socket(&name_loop->name[strlen("socket:")], msg->devpath, msg->action);
                list_for_each_entry(name_loop, &udev->run_list, node) {
                        if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
                                pass_env_to_socket(&name_loop->name[strlen("socket:")], msg->devpath, msg->action);

diff --git a/udevstart.c b/udevstart.c
index fdb2ae38081ad495629c2f03ce34f295710de61c..8f8342ff48f80a19d841b3c83f85e45e47cbd95a 100644 (file)
--- a/udevstart.c
+++ b/udevstart.c
@@ -108,6 +108,7 @@ static int add_device(const char *devpath)
 {
        struct sysfs_device *dev;
        struct udevice *udev;
 {
        struct sysfs_device *dev;
        struct udevice *udev;

+       int retval;

 
        /* clear and set environment for next event */
        clearenv();
 
        /* clear and set environment for next event */
        clearenv();


@@ -146,14 +147,14 @@ static int add_device(const char *devpath)
                dbg("device event will be ignored");
                goto exit;
        }
                dbg("device event will be ignored");
                goto exit;
        }

-       if (udev->name[0] == '\0') {
-               dbg("device node creation supressed");
-               goto run;
+       if (udev->name[0] != '\0')
+               retval = udev_add_device(udev);
+       else {
+               info("device node creation supressed");
+               goto exit;

        }
 
        }
 

-       udev_add_device(udev);
-run:
-       if (udev_run && !list_empty(&udev->run_list)) {
+       if (retval == 0 && !udev->ignore_device && udev_run) {

                struct name_entry *name_loop;
 
                dbg("executing run list");
                struct name_entry *name_loop;
 
                dbg("executing run list");


@@ -169,9 +170,9 @@ run:
                        }
                }
        }
                        }
                }
        }

+

 exit:
        udev_device_cleanup(udev);
 exit:
        udev_device_cleanup(udev);

-

        return 0;
 }
 
        return 0;
 }