From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 4 Apr 2007 05:55:32 +0000 (+1000)
Subject: Merge branch 'master' of ssh://ozlabs.org/home/jk/git/petitboot
X-Git-Tag: v0.0.1~24
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=d24e0892cd09e9d41793a59e66b7f86a99b40343

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

d24e0892cd09e9d41793a59e66b7f86a99b40343
diff --cc petitboot.c
index b443280,d566e3f..416434a
--- a/petitboot.c
+++ b/petitboot.c
@@@ -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 82251e4,e9102df..a77bfef
--- a/petitboot.h
+++ b/petitboot.h
@@@ -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);