X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=d95a37cb0c7c41ae420001d4c227cfa012c33b2f;hp=487f2e73506221a316cd8e3b72928cccc733b167;hb=120855d64d783aa3b3b0af23923da0169319c338;hpb=a3e3b66fbcb18174fc54ffd771ef3a38c9f8defd diff --git a/discover/device-handler.c b/discover/device-handler.c index 487f2e7..d95a37c 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -755,8 +755,16 @@ int device_handler_discover(struct device_handler *handler, struct discover_device *dev) { struct discover_context *ctx; + struct boot_status *status; int rc; + status = talloc_zero(handler, struct boot_status); + status->type = BOOT_STATUS_INFO; + status->message = talloc_asprintf(status, "Processing %s device %s", + device_type_display_name(dev->device->type), + dev->device->id); + boot_status(handler, status); + process_boot_option_queue(handler); /* create our context */ @@ -777,6 +785,11 @@ int device_handler_discover(struct device_handler *handler, device_handler_discover_context_commit(handler, ctx); out: + status->message = talloc_asprintf(status,"Processing %s complete\n", + dev->device->id); + boot_status(handler, status); + + talloc_free(status); talloc_free(ctx); return 0; @@ -787,6 +800,13 @@ int device_handler_dhcp(struct device_handler *handler, struct discover_device *dev, struct event *event) { struct discover_context *ctx; + struct boot_status *status; + + status = talloc_zero(handler, struct boot_status); + status->type = BOOT_STATUS_INFO; + status->message = talloc_asprintf(status, "Processing dhcp event on %s", + dev->device->id); + boot_status(handler, status); /* create our context */ ctx = device_handler_discover_context_create(handler, dev); @@ -796,6 +816,11 @@ int device_handler_dhcp(struct device_handler *handler, device_handler_discover_context_commit(handler, ctx); + status->message = talloc_asprintf(status,"Processing %s complete\n", + dev->device->id); + boot_status(handler, status); + + talloc_free(status); talloc_free(ctx); return 0; @@ -806,6 +831,12 @@ int device_handler_conf(struct device_handler *handler, struct discover_device *dev, struct pb_url *url) { struct discover_context *ctx; + struct boot_status *status; + + status = talloc_zero(handler, struct boot_status); + status->type = BOOT_STATUS_INFO; + status->message = talloc_asprintf(status, "Processing user config"); + boot_status(handler, status); /* create our context */ ctx = device_handler_discover_context_create(handler, dev); @@ -815,6 +846,11 @@ int device_handler_conf(struct device_handler *handler, device_handler_discover_context_commit(handler, ctx); + status->message = talloc_asprintf(status, + "Processing user config complete"); + boot_status(handler, status); + + talloc_free(status); talloc_free(ctx); return 0;