Merge branch 'master' of ssh://ozlabs.org/home/jk/git/petitboot

diff --git a/devices.c b/devices.c
index 43a388dfbecd832da7098eea799bf285802838b7..4936f9ab2adfc515c61ff30a990dcc7cdcfea369 100644 (file)
--- a/devices.c
+++ b/devices.c
@@ -238,7 +238,7 @@ static twin_bool_t pboot_proc_server_sock(int sock, twin_file_op_t ops,
        return TWIN_TRUE;
 }
 
-int pboot_start_device_discovery(void)
+int pboot_start_device_discovery(int udev_trigger)
 {
        int sock;
        struct sockaddr_un addr;
@@ -269,6 +269,12 @@ int pboot_start_device_discovery(void)
 
        twin_set_file(pboot_proc_server_sock, sock, TWIN_READ, &_ctx);
 
+       if (udev_trigger) {
+               int rc = system("udevtrigger");
+               if (rc)
+                       LOG("udevtrigger failed, rc %d\n", rc);
+       }
+
        return TWIN_TRUE;
 }
 

diff --git a/petitboot.c b/petitboot.c
index b443280bcd6326bae110915c45d8b2af5a7416f9..416434adbeba2d8bca13b7d515906eaa1493f869 100644 (file)
--- a/petitboot.c
+++ b/petitboot.c
@@ -993,8 +993,35 @@ static void sigint(int sig)
        syscall(__NR_exit);
 }
 
+static void usage(const char *progname)
+{
+       fprintf(stderr, "Usage: %s [-u] [-h]\n", progname);
+}
+
 int main(int argc, char **argv)
 {
+       int c;
+       int udev_trigger = 0;
+
+       for (;;) {
+               c = getopt(argc, argv, "u::h");
+               if (c == -1)
+                       break;
+
+               switch (c) {
+               case 'u':
+                       udev_trigger = 1;
+                       break;
+               case 'h':
+                       usage(argv[0]);
+                       return EXIT_SUCCESS;
+               default:
+                       fprintf(stderr, "Unknown option '%c'\n", c);
+                       usage(argv[0]);
+                       return EXIT_FAILURE;
+               }
+       }
+
        atexit(exitfunc);
        signal(SIGINT, sigint);
 
@@ -1035,7 +1062,7 @@ int main(int argc, char **argv)
        pboot_create_rpane();
        pboot_create_spane();
 
-       if (!pboot_start_device_discovery()) {
+       if (!pboot_start_device_discovery(udev_trigger)) {
                LOG("Couldn't start device discovery!\n");
                return 1;
        }

diff --git a/petitboot.h b/petitboot.h
index 82251e41181698bae5fdb7cad80810622e5b2738..a77bfef7c864e2035e18f55824ce785ef94c7dd5 100644 (file)
--- a/petitboot.h
+++ b/petitboot.h
@@ -12,6 +12,6 @@ int pboot_add_option(int devindex, const char *title,
                     const char *subtitle, twin_pixmap_t *badge, void *data);
 int pboot_remove_device(const char *dev_id);
 
-int pboot_start_device_discovery(void);
+int pboot_start_device_discovery(int udev_trigger);
 void pboot_exec_option(void *data);
 void pboot_message(const char *message);