discover/grub2: Allow to separate the --id argument using a space char

[petitboot] / discover / grub2 / env.c

diff --git a/discover/grub2/env.c b/discover/grub2/env.c
index 1336824d1d92fb2bbc9d16945b4d3330135db6e1..74d5729dd19bb3c81255fb38d93bc4c9f38df878 100644 (file)
--- a/discover/grub2/env.c
+++ b/discover/grub2/env.c
@@ -86,6 +86,8 @@ int builtin_load_env(struct grub2_script *script,
 
        if (!rc) {
                rc = parse_buf_to_env(script, buf, len);
+               if (rc)
+                       pb_debug_fn("Failed to set env\n");
                talloc_free(buf);
        }
 
@@ -214,6 +216,7 @@ int builtin_save_env(struct grub2_script *script,
        int i, rc, len, siglen;
        char *buf, *envpath;
        const char *envfile;
+       bool using_dash_f = false;
 
        /* we only support local filesystems */
        if (!dev->mounted) {
@@ -222,9 +225,15 @@ int builtin_save_env(struct grub2_script *script,
                return -1;
        }
 
-       if (argc == 3 && !strcmp(argv[1], "-f"))
+       if (argc >= 2 && !strcmp(argv[1], "-f")) {
+               if (argc < 3) {
+                       pb_log("save_env: for -f, need argument\n");
+                       return -1;
+               }
+
                envfile = argv[2];
-       else
+               using_dash_f = true;
+       } else
                envfile = default_envfile;
 
        envpath = talloc_asprintf(script, "%s/%s",
@@ -241,11 +250,19 @@ int builtin_save_env(struct grub2_script *script,
        if (rc || len < siglen || memcmp(buf, signature, siglen))
                goto err;
 
-       for (i = 1; i < argc; i++) {
+       /* For "-f", skip the "-f <file>" arguments in picking the
+        * variables to save. */
+       i = (using_dash_f ? 3 : 1);
+
+       for (; i < argc; i++) {
                const char *name, *value;
 
                name = argv[i];
                value = script_env_get(script, name);
+               if (!value) {
+                       pb_log("Saved unset environment variable %s!\n", name);
+                       value = "";
+               }
 
                update_env(buf + siglen, len - siglen, name, value);
        }