Re: [PATCH] add --boot-directory option to grub-mkstandalone

[Andrey Borzenkov]

В Пт, 20/12/2013 в 12:16 +0000, Colin Watson пишет:
> On Fri, Dec 13, 2013 at 07:40:54PM +0400, Andrey Borzenkov wrote:
> > > 2) make it possible for grub-mkstandalone to build images with the
> > >    prefix set to something other than (memdisk)/boot/grub
> > 
> > Like below?
> 
> Indeed, I like this general approach, and it's probably better than
> fiddling around with "search".
> 
> > I'm not keen on using --boot-directory; may be using full
> > --grub-directory (without implied ../grub) will actually be more
> > logical.
> 
> I agree - I would prefer to explicitly specify the whole thing.  Could
> you redo the patch that way?
> 

See below

> >  enum
> >    {
> >      OPTION_OUTPUT = 'o',
> > -    OPTION_FORMAT = 'O'
> > +    OPTION_FORMAT = 'O',
> > +    OPTION_BOOT_DIRECTORY = 0x301,
> > +
> >    };
> 
> Stray newline.
> 
Fixed

> > @@ -346,8 +359,8 @@ main (int argc, char *argv[])
> >    grub_install_push_module ("tar");
> >  
> >    grub_install_make_image_wrap (grub_install_source_directory,
> > -                           "(memdisk)/boot/grub", output_image,
> > -                           memdisk_img, NULL,
> > +                           xasprintf ("(memdisk)%s/%s", bootdir, "grub"),
> > +                           output_image, memdisk_img, NULL,
> >                             grub_util_get_target_name (format), 0);
> >  
> >    grub_util_unlink (memdisk_img);
> 
> I'd probably assign the result of that xasprintf to a variable in order
> to be able to free it, for valgrind-friendliness.
> 

Well, I could do it but as part of separate clean up patch. There are
many non-freed allocations besides it.

From: Andrey Borzenkov <address@hidden>
Subject: [PATCH] add --boot-directory option to grub-mkstandalone

This allows changing of hardcoded /boot/grub path on memory disk so it does
not conflict with on-disk /boot directories.

Suggested by Colin Watson

---
 util/grub-mkstandalone.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/util/grub-mkstandalone.c b/util/grub-mkstandalone.c
index 576ab40..77c1998 100644
--- a/util/grub-mkstandalone.c
+++ b/util/grub-mkstandalone.c
@@ -30,15 +30,19 @@ static char **files;
 static int nfiles;
 const struct grub_install_image_target_desc *format;
 static FILE *memdisk;
+static char *grubdir;
 
 enum
   {
     OPTION_OUTPUT = 'o',
-    OPTION_FORMAT = 'O'
+    OPTION_FORMAT = 'O',
+    OPTION_GRUB_DIRECTORY = 0x301,
   };
 
 static struct argp_option options[] = {
   GRUB_INSTALL_OPTIONS,
+  {"grub-directory", OPTION_GRUB_DIRECTORY, N_("DIR"),
+   0, N_("install GRUB images under the directory DIR instead of the 
/boot/grub directory"), 2},
   {"output", 'o', N_("FILE"),
    0, N_("save output in FILE [required]"), 2},
   {"format", 'O', N_("FILE"), 0, 0, 2},
@@ -76,6 +80,11 @@ argp_parser (int key, char *arg, struct argp_state *state)
   switch (key)
     {
 
+    case OPTION_GRUB_DIRECTORY:
+      free (grubdir);
+      grubdir = xstrdup (arg);
+      return 0;
+
     case 'o':
       if (output_image)
        free (output_image);
@@ -294,6 +303,9 @@ main (int argc, char *argv[])
 
   argp_parse (&argp, argc, argv, 0, 0, 0);
 
+  if (!grubdir)
+    grubdir = xstrdup ("/boot/grub");
+
   pkglibdir = grub_util_get_pkglibdir ();
 
   if (!output_image)
@@ -308,7 +320,7 @@ main (int argc, char *argv[])
   enum grub_install_plat plat = grub_install_get_target 
(grub_install_source_directory);
 
   char *memdisk_dir = grub_util_make_temporary_dir ();
-  char *boot_grub = grub_util_path_concat (3, memdisk_dir, "boot", "grub");
+  char *boot_grub = grub_util_path_concat (2, memdisk_dir, grubdir);
   grub_install_copy_files (grub_install_source_directory,
                           boot_grub, plat);
 
@@ -346,8 +358,8 @@ main (int argc, char *argv[])
   grub_install_push_module ("tar");
 
   grub_install_make_image_wrap (grub_install_source_directory,
-                               "(memdisk)/boot/grub", output_image,
-                               memdisk_img, NULL,
+                               xasprintf ("(memdisk)%s", bootdir),
+                               output_image, memdisk_img, NULL,
                                grub_util_get_target_name (format), 0);
 
   grub_util_unlink (memdisk_img);
-- 
tg: (065adc3..) u/grub-directory (depends on: master)