Add udevadm to pb_system_apps

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Geoff Levand <geoff@infradead.org>

diff --git a/discover/udev.c b/discover/udev.c
index fb64221dad1d90036db782a3a1762f441e27e45c..28357c7e1b0b0441952aab16646ee1d1d67395c9 100644 (file)
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -158,7 +158,7 @@ out_err:
 int udev_trigger(struct udev __attribute__((unused)) *udev)
 {
        const char *cmd[] = {
-               "/sbin/udevadm,
+               pb_system_apps.udevadm,
                "trigger",
                "--subsystem-match=block",
                "--action=add",

diff --git a/lib/system/system.c b/lib/system/system.c
index d77159d5a7b882470648c740aa301b0314fd67c6..3b30f04519fe34f2c89321b4977edc678991e839 100644 (file)
--- a/lib/system/system.c
+++ b/lib/system/system.c
@@ -24,6 +24,7 @@ const struct pb_system_apps pb_system_apps = {
        .shutdown = "/sbin/shutdown",
        .sftp = "/usr/bin/sftp",
        .tftp = "/usr/bin/tftp",
+       .udevadm = "/sbin/udevadm",
        .umount = "/bin/umount",
        .wget = "/usr/bin/wget",
 };

diff --git a/lib/system/system.h b/lib/system/system.h
index f8f18a3cdbe0e8cbee8e5b12b7819b988e9617e1..e7a2c68ac91cf0430e5d08713b28a41283fa6a76 100644 (file)
--- a/lib/system/system.h
+++ b/lib/system/system.h
@@ -9,6 +9,7 @@ struct pb_system_apps {
        const char *shutdown;
        const char *sftp;
        const char *tftp;
+       const char *udevadm;
        const char *umount;
        const char *wget;
 };