discover: Skip malformed bootdev fields

[petitboot] / utils / pb-config.c

diff --git a/utils/pb-config.c b/utils/pb-config.c
index 3bd670c6d002e98de30813da46665d46de9aa2bb..c52180b71686dde5f91ab9920accefb481486e88 100644 (file)
--- a/utils/pb-config.c
+++ b/utils/pb-config.c
@@ -61,7 +61,16 @@ static void print_one_config(void *ctx, const char *req, const char *name,
 
 static void print_config(void *ctx, struct config *config, const char *var)
 {
-       print_one_config(ctx, var, "bootdev", "%s", config->boot_device);
+       unsigned int i;
+
+       for (i = 0; i < config->n_autoboot_opts; i++) {
+               if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE)
+                       print_one_config(ctx, var, "bootdev", "%s",
+                        device_type_name(config->autoboot_opts[i].type));
+               else
+                       print_one_config(ctx, var, "bootdev", "%s",
+                                        config->autoboot_opts[i].uuid);
+       }
        print_one_config(ctx, var, "autoboot", "%s",
                        config->autoboot_enabled ? "enabled" : "disabled");
        print_one_config(ctx, var, "timeout", "%d",
@@ -70,6 +79,8 @@ static void print_config(void *ctx, struct config *config, const char *var)
                        config->safe_mode ? "enabled" : "disabled");
        print_one_config(ctx, var, "debug", "%s",
                        config->debug ? "enabled" : "disabled");
+       print_one_config(ctx, var, "dm-snapshots", "%s",
+                       config->disable_snapshots ? "disabled" : "enabled");
 }
 
 int main(int argc, char **argv)