chiark / gitweb /
input_id: code cleanup
[elogind.git] / udev / udevd.c
index 88e117f50a1f46807688aeafebaaa4e7295510e9..300d6035191a8e55e7c09d2d85e6d0272f53c147 100644 (file)
@@ -293,7 +293,7 @@ static void worker_new(struct event *event)
                                alarm(udev_device_get_event_timeout(dev));
 
                        /* execute RUN= */
-                       if (err == 0 && !udev_event->ignore_device && udev_get_run(udev_event->udev))
+                       if (err == 0 && udev_get_run(udev_event->udev))
                                failed = udev_event_execute_run(udev_event,
                                                                &orig_sigmask);
 
@@ -919,6 +919,7 @@ int main(int argc, char *argv[])
                                  IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
        } else {
                char filename[UTIL_PATH_SIZE];
+               struct stat statbuf;
 
                inotify_add_watch(pfd[FD_INOTIFY].fd, LIBEXECDIR "/rules.d",
                                  IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
@@ -927,6 +928,12 @@ int main(int argc, char *argv[])
 
                /* watch dynamic rules directory */
                util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/rules.d", NULL);
+               if (stat(filename, &statbuf) != 0) {
+                       util_create_path(udev, filename);
+                       udev_selinux_setfscreatecon(udev, filename, S_IFDIR|0755);
+                       mkdir(filename, 0755);
+                       udev_selinux_resetfscreatecon(udev);
+               }
                inotify_add_watch(pfd[FD_INOTIFY].fd, filename,
                                  IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
        }