Skip to contentSkip to conversation

trivial fix for config_file without directory part

PATCH In review Andrey Borzenkov 2 participants 5 messages Dec 7, 2013 – Dec 9, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 trivial fix for config_file without directory part

It is legal to use "configfile <top level filename>" where filename does not contain directory part. In this case config_directory is set to filename. Set it to empty string so $config_directory/file works as expected.

May be it makes sense to generate full pathname (including device part) so that interpretation of $config_directory does not depend on possible change of $root.

---
 grub-core/normal/main.c | 2 ++
 1 file changed, 2 insertions(+)
grub-core/normal/main.c +2 -0
index 991a595..16f22fb 100644
@@ -196,6 +196,8 @@ read_config_file (const char *config)
     ptr = grub_strrchr (config_dir, '/');
   if (ptr)
     *ptr = 0;
+  else if (config_dir)
+    *config_dir = 0;
   grub_env_set ("config_directory", config_dir);
   grub_free (config_dir);
 
Signature · 1 line
tg: (bb05e31..) u/config_file_without_dir (depends on: master)
#1 lore raw
Quoted 4 lines · Andrey Borzenkov

It is legal to use "configfile <top level filename>" where filename does not contain directory part. In this case config_directory is set to filename. Set it to empty string so $config_directory/file works as expected.

The only filenames valid in GRUB are of forms:
[(device)]/path
[(device)]blocklist
All others are invalid even if the happend to be accepted by current version.

Quoted 22 lines

May be it makes sense to generate full pathname (including device part) so that interpretation of $config_directory does not depend on possible change of $root.

---
 grub-core/normal/main.c | 2 ++
 1 file changed, 2 insertions(+)
grub-core/normal/main.c +2 -0
index 991a595..16f22fb 100644
@@ -196,6 +196,8 @@ read_config_file (const char *config)
     ptr = grub_strrchr (config_dir, '/');
   if (ptr)
     *ptr = 0;
+  else if (config_dir)
+    *config_dir = 0;
   grub_env_set ("config_directory", config_dir);
   grub_free (config_dir);
 
#2 lore raw
In reply to Andrey Borzenkov
Quoted 3 lines · Andrey Borzenkov

May be it makes sense to generate full pathname (including device part) so that interpretation of $config_directory does not depend on possible change of $root.

Adding ($root) to config_file/config_directory if none present would be good.

#3 lore raw

PATCH 1/1 always define config_directory and config_file as full pathname

Quoted 2 lines

Adding ($root) to config_file/config_directory if none present would be good.

Like this?

If configfile is relative pathname, extend it with current ($root) so its interpretation does not change if $root is changed later.

Suggested by Vladimir Serbienko.

---
 grub-core/normal/main.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)
grub-core/normal/main.c +19 -7
index 991a595..84df360 100644
@@ -190,14 +190,26 @@ read_config_file (const char *config)
   ctmp = grub_env_get ("config_directory");
   if (ctmp)
     old_dir = grub_strdup (ctmp);
-  grub_env_set ("config_file", config);
-  config_dir = grub_strdup (config);
+  if (*config == '(')
+    {
+      grub_env_set ("config_file", config);
+      config_dir = grub_strdup (config);
+    }
+  else
+    {
+      /* $root is guranteed to be defined, otherwise open above would fail */
+      config_dir = grub_xasprintf ("(%s)%s", grub_env_get ("root"), config);
+      if (config_dir)
+	grub_env_set ("config_file", config_dir);
+    }
   if (config_dir)
-    ptr = grub_strrchr (config_dir, '/');
-  if (ptr)
-    *ptr = 0;
-  grub_env_set ("config_directory", config_dir);
-  grub_free (config_dir);
+    {
+      ptr = grub_strrchr (config_dir, '/');
+      if (ptr)
+	*ptr = 0;
+      grub_env_set ("config_directory", config_dir);
+      grub_free (config_dir);
+    }
 
   grub_env_export ("config_file");
   grub_env_export ("config_directory");
Signature · 1 line
tg: (78b2b0a..) u/config_file_without_dir (depends on: master)
#4 lore raw

Re: [PATCH] always define config_directory and config_file as full pathname

Go ahead.

Quoted 53 lines · Andrey Borzenkov
Quoted 2 lines

Adding ($root) to config_file/config_directory if none present would be good.

Like this?

If configfile is relative pathname, extend it with current ($root) so its interpretation does not change if $root is changed later.

Suggested by Vladimir Serbienko.

---
 grub-core/normal/main.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)
grub-core/normal/main.c +19 -7
index 991a595..84df360 100644
@@ -190,14 +190,26 @@ read_config_file (const char *config)
   ctmp = grub_env_get ("config_directory");
   if (ctmp)
     old_dir = grub_strdup (ctmp);
-  grub_env_set ("config_file", config);
-  config_dir = grub_strdup (config);
+  if (*config == '(')
+    {
+      grub_env_set ("config_file", config);
+      config_dir = grub_strdup (config);
+    }
+  else
+    {
+      /* $root is guranteed to be defined, otherwise open above would fail */
+      config_dir = grub_xasprintf ("(%s)%s", grub_env_get ("root"), config);
+      if (config_dir)
+	grub_env_set ("config_file", config_dir);
+    }
   if (config_dir)
-    ptr = grub_strrchr (config_dir, '/');
-  if (ptr)
-    *ptr = 0;
-  grub_env_set ("config_directory", config_dir);
-  grub_free (config_dir);
+    {
+      ptr = grub_strrchr (config_dir, '/');
+      if (ptr)
+	*ptr = 0;
+      grub_env_set ("config_directory", config_dir);
+      grub_free (config_dir);
+    }
 
   grub_env_export ("config_file");
   grub_env_export ("config_directory");