X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=5f63a6eedf20a2c78901f76adf19cc7954dd7994;hp=af7918b5114000f1c706564ebb0a8c9d05b116f3;hb=c35df3e254e6dbfd69737afc781b7aae59e4ccd4;hpb=bdd5c29b008a4484ed141f934d97465d673a10b7 diff --git a/discover/device-handler.c b/discover/device-handler.c index af7918b..5f63a6e 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -114,6 +114,12 @@ const struct discover_device *device_handler_get_device( return handler->devices[index]; } +struct network *device_handler_get_network( + const struct device_handler *handler) +{ + return handler->network; +} + struct discover_boot_option *discover_boot_option_create( struct discover_context *ctx, struct discover_device *device) @@ -788,8 +794,8 @@ struct discover_context *device_handler_discover_context_create( struct discover_context *ctx; ctx = talloc_zero(handler, struct discover_context); + ctx->handler = handler; ctx->device = device; - ctx->network = handler->network; list_init(&ctx->boot_options); return ctx; @@ -934,8 +940,6 @@ int device_handler_discover(struct device_handler *handler, device_handler_discover_context_commit(handler, ctx); out: - device_handler_status_dev_info(handler, dev, _("Processing complete")); - talloc_unlink(handler, ctx); return 0; @@ -959,8 +963,6 @@ int device_handler_dhcp(struct device_handler *handler, device_handler_discover_context_commit(handler, ctx); - device_handler_status_dev_info(handler, dev, _("Processing complete")); - talloc_unlink(handler, ctx); return 0;