delete vol_id and require util-linux-ng's blkid

[elogind.git] / udev / udevadm-settle.c

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index 54f905bf6ff1c2165b4421c5a87f7e4631aec0e4..3b26f10d5035f815148118e1db36d93637d49d34 100644 (file)
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -1,5 +1,7 @@
 /*
  * Copyright (C) 2006-2008 Kay Sievers <kay@vrfy.org>
+ * 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
@@ -34,13 +36,15 @@
 #define DEFAULT_TIMEOUT                        180
 #define LOOP_PER_SECOND                        20
 
-static int volatile is_timeout;
+static volatile sig_atomic_t is_timeout;
 
-static void asmlinkage sig_handler(int signum)
+static void sig_handler(int signum)
 {
        switch (signum) {
                case SIGALRM:
                        is_timeout = 1;
+               case SIGUSR1:
+                       ;
        }
 }
 
@@ -66,10 +70,11 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 
        /* set signal handlers */
        memset(&act, 0x00, sizeof(act));
-       act.sa_handler = (void (*)(int)) sig_handler;
+       act.sa_handler = sig_handler;
        sigemptyset (&act.sa_mask);
        act.sa_flags = 0;
        sigaction(SIGALRM, &act, NULL);
+       sigaction(SIGUSR1, &act, NULL);
 
        while (1) {
                int option;
@@ -148,6 +153,24 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
                }
        }
 
+       /* guarantee that the udev daemon isn't pre-processing */
+       if (getuid() == 0) {
+               struct udev_ctrl *uctrl;
+
+               uctrl = udev_ctrl_new_from_socket(udev, UDEV_CTRL_SOCK_PATH);
+               if (uctrl != NULL) {
+                       sigset_t mask, oldmask;
+
+                       sigemptyset(&mask);
+                       sigaddset(&mask, SIGUSR1);
+                       sigaddset(&mask, SIGALRM);
+                       sigprocmask(SIG_BLOCK, &mask, &oldmask);
+                       if (udev_ctrl_send_settle(uctrl) > 0)
+                               sigsuspend(&oldmask);
+                       udev_ctrl_unref(uctrl);
+               }
+       }
+
        while (!is_timeout) {
                /* exit if queue is empty */
                if (udev_queue_get_queue_is_empty(udev_queue))