Add udev trigger

Add a new routine udev_trigger() that requests a replay of
system udev events.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 2b04e62ee0247ab95d153325c9d3f2f865ca28bb..4d618147f15c8e1a18a4ec6a900dd92c240ba2b7 100644 (file)
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -52,6 +52,8 @@ int main(void)
        if (!udev)
                return EXIT_FAILURE;
 
+       udev_trigger(udev);
+
        for (running = 1; running;) {
                if (waiter_poll())
                        break;

diff --git a/discover/udev.c b/discover/udev.c
index b93c1a5f0ff6d68dace1c0cf8605c528dd11f3c2..54967128f6006db813332ebc886821118d3d25b3 100644 (file)
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -208,6 +208,16 @@ out_err:
        return NULL;
 }
 
+int udev_trigger(struct udev __attribute__((unused)) *udev)
+{
+       int rc = system("/sbin/udevadm trigger --subsystem-match=block");
+
+       if (rc)
+               pb_log("udev trigger failed: %d (%d)\n", rc, WEXITSTATUS(rc));
+
+       return WEXITSTATUS(rc);
+}
+
 void udev_destroy(struct udev *udev)
 {
        talloc_free(udev);

diff --git a/discover/udev.h b/discover/udev.h
index 250273f2722eb27e52774adfb560e7d92cbbac41..afdbbe18667c1158e1f7523930e12e2f04f1b00a 100644 (file)
--- a/discover/udev.h
+++ b/discover/udev.h
@@ -21,6 +21,7 @@ struct udev;
 struct device_handler;
 
 struct udev *udev_init(struct device_handler *handler);
+int udev_trigger(struct udev *udev);
 
 void udev_destroy(struct udev *udev);