vol_id: fix language in manpage

[elogind.git] / udev / udevd.c

diff --git a/udev/udevd.c b/udev/udevd.c
index cfc091b699067e7d2e47214880b85ef9feb99d2f..291655ef000132c677138109140d729892045343 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2004-2008 Kay Sievers <kay.sievers@vrfy.org>
  * Copyright (C) 2004 Chris Friesen <chris_friesen@sympatico.ca>
+ * Copyright (C) 2009 Canonical Ltd.
+ * Copyright (C) 2009 Scott James Remnant <scott@netsplit.com>
  *
  * 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
@@ -69,6 +71,7 @@ static volatile int sigchilds_waiting;
 static volatile int udev_exit;
 static volatile int reload_config;
 static volatile int signal_received;
+static volatile pid_t settle_pid;
 static int run_exec_q;
 static int stop_exec_q;
 static int max_childs;
@@ -215,17 +218,6 @@ static void event_fork(struct udev_event *event)
                /* set timeout to prevent hanging processes */
                alarm(UDEV_EVENT_TIMEOUT);
 
-               /* clear any existing udev watch on the node */
-               if (inotify_fd != -1) {
-                       struct udev_device *dev_old;
-
-                       dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(event->dev));
-                       if (dev_old != NULL) {
-                               udev_watch_end(event->udev, dev_old);
-                               udev_device_unref(dev_old);
-                       }
-               }
-
                /* apply rules, create node, symlinks */
                err = udev_event_execute_rules(event, rules);
 
@@ -238,9 +230,10 @@ static void event_fork(struct udev_event *event)
                        udev_event_execute_run(event);
 
                /* apply/restore inotify watch */
-               if (err == 0 && event->inotify_watch &&
-                   strcmp(udev_device_get_action(event->dev), "remove") != 0)
+               if (err == 0 && event->inotify_watch) {
                        udev_watch_begin(event->udev, event->dev);
+                       udev_device_update_db(event->dev);
+               }
 
                info(event->udev, "seq %llu exit with %i\n", udev_device_get_seqnum(event->dev), err);
                logging_close();
@@ -523,6 +516,11 @@ static void handle_ctrl_msg(struct udev_ctrl *uctrl)
                info(udev, "udevd message (SET_MAX_CHILDS) received, max_childs=%i\n", i);
                max_childs = i;
        }
+
+       settle_pid = udev_ctrl_get_settle(ctrl_msg);
+       if (settle_pid > 0) {
+               info(udev, "udevd message (SETTLE) received\n");
+       }
        udev_ctrl_msg_unref(ctrl_msg);
 }
 
@@ -1033,6 +1031,11 @@ handle_signals:
                        if (!stop_exec_q)
                                event_queue_manager(udev);
                }
+
+               if (settle_pid > 0) {
+                       kill(settle_pid, SIGUSR1);
+                       settle_pid = 0;
+               }
        }
        cleanup_queue_dir(udev);
        rc = 0;