Merge branch 'master' of ssh://ozlabs.org/home/jk/git/petitboot
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 4 Apr 2007 05:55:32 +0000 (15:55 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 4 Apr 2007 05:55:32 +0000 (15:55 +1000)
1  2 
petitboot.c
petitboot.h

diff --cc petitboot.c
index b443280bcd6326bae110915c45d8b2af5a7416f9,d566e3ff188ff7dc8cf20d36b52545fe2e894205..416434adbeba2d8bca13b7d515906eaa1493f869
@@@ -1031,11 -979,11 +1058,11 @@@ int main(int argc, char **argv
        pboot_make_background();
  
        /* Init more stuffs */
 -      pboot_create_panels();
 -      twin_window_queue_paint(pboot_lpane->window);
 -      twin_window_queue_paint(pboot_rpane->window);
 +      pboot_create_lpane();
 +      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 --cc petitboot.h
index 82251e41181698bae5fdb7cad80810622e5b2738,e9102df9504ee42f5fdab2f0d8fb7b0d9eb78482..a77bfef7c864e2035e18f55824ce785ef94c7dd5
@@@ -12,6 -12,5 +12,6 @@@ int pboot_add_option(int devindex, cons
                     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);