assert(!opt->option->boot_image_file);
assert(!opt->option->initrd_file);
assert(!opt->option->icon_file);
+ assert(!opt->option->device_id);
if (opt->boot_image)
opt->option->boot_image_file = opt->boot_image->url->full;
opt->option->initrd_file = opt->initrd->url->full;
if (opt->icon)
opt->option->icon_file = opt->icon->url->full;
+
+ opt->option->device_id = opt->device->device->id;
}
static void process_boot_option_queue(struct device_handler *handler)
{
const char *argv[6];
+ if (!dev->device_path)
+ return -1;
+
if (!dev->mount_path)
dev->mount_path = join_paths(dev, mount_base(),
dev->device_path);
static int device_match_path(struct discover_device *dev, const char *path)
{
- return !strcmp(dev->device_path, path);
+ return dev->device_path && !strcmp(dev->device_path, path);
}
static int device_match_uuid(struct discover_device *dev, const char *uuid)