dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0042-util-grub-install.c-List-available-targets.patch

39700a
From d25ddbcafa537525f606938df0e500c50a5e93e1 Mon Sep 17 00:00:00 2001
39700a
From: Vladimir Serbinenko <phcoder@gmail.com>
39700a
Date: Fri, 24 Jan 2014 18:09:25 +0100
39700a
Subject: [PATCH 042/143] 	* util/grub-install.c: List available targets.
39700a
39700a
---
39700a
 ChangeLog                   |  4 ++++
39700a
 include/grub/util/install.h |  2 ++
39700a
 util/grub-install-common.c  | 30 ++++++++++++++++++++++++++++++
39700a
 util/grub-install.c         | 10 ++++++++--
39700a
 4 files changed, 44 insertions(+), 2 deletions(-)
39700a
39700a
diff --git a/ChangeLog b/ChangeLog
39700a
index eee8e78..20e8baa 100644
39700a
--- a/ChangeLog
39700a
+++ b/ChangeLog
39700a
@@ -1,3 +1,7 @@
39700a
+2014-01-24  Vladimir Serbinenko  <phcoder@gmail.com>
39700a
+
39700a
+	* util/grub-install.c: List available targets.
39700a
+
39700a
 2014-01-23  Colin Watson  <cjwatson@ubuntu.com>
39700a
 
39700a
 	* util/grub-install.c (write_to_disk): Add an info message.
39700a
diff --git a/include/grub/util/install.h b/include/grub/util/install.h
39700a
index bc987aa..aedcd29 100644
39700a
--- a/include/grub/util/install.h
39700a
+++ b/include/grub/util/install.h
39700a
@@ -138,6 +138,8 @@ grub_install_get_platform_cpu (enum grub_install_plat platid);
39700a
 const char *
39700a
 grub_install_get_platform_platform (enum grub_install_plat platid);
39700a
 
39700a
+char *
39700a
+grub_install_get_platforms_string (void);
39700a
 
39700a
 typedef enum {
39700a
   GRUB_COMPRESSION_AUTO,
39700a
diff --git a/util/grub-install-common.c b/util/grub-install-common.c
39700a
index 6ea0a8e..c8bedcb 100644
39700a
--- a/util/grub-install-common.c
39700a
+++ b/util/grub-install-common.c
39700a
@@ -668,6 +668,36 @@ static struct
39700a
   }; 
39700a
 
39700a
 char *
39700a
+grub_install_get_platforms_string (void)
39700a
+{
39700a
+  char **arr = xmalloc (sizeof (char *) * ARRAY_SIZE (platforms));
39700a
+  int platform_strins_len = 0;
39700a
+  char *platforms_string;
39700a
+  char *ptr;
39700a
+  unsigned i;
39700a
+  for (i = 0; i < ARRAY_SIZE (platforms); i++)
39700a
+    {
39700a
+      arr[i] = xasprintf ("%s-%s", platforms[i].cpu,
39700a
+			  platforms[i].platform);
39700a
+      platform_strins_len += strlen (arr[i]) + 2;
39700a
+    }
39700a
+  ptr = platforms_string = xmalloc (platform_strins_len);
39700a
+  qsort (arr, ARRAY_SIZE (platforms), sizeof (char *), grub_qsort_strcmp);
39700a
+  for (i = 0; i < ARRAY_SIZE (platforms); i++)
39700a
+    {
39700a
+      strcpy (ptr, arr[i]);
39700a
+      ptr += strlen (arr[i]);
39700a
+      *ptr++ = ',';
39700a
+      *ptr++ = ' ';
39700a
+      free (arr[i]);
39700a
+    }
39700a
+  ptr[-2] = 0;
39700a
+  free (arr);
39700a
+ 
39700a
+  return platforms_string;
39700a
+}
39700a
+
39700a
+char *
39700a
 grub_install_get_platform_name (enum grub_install_plat platid)
39700a
 {
39700a
   return xasprintf ("%s-%s", platforms[platid].cpu,
39700a
diff --git a/util/grub-install.c b/util/grub-install.c
39700a
index 787dc90..2e6226a 100644
39700a
--- a/util/grub-install.c
39700a
+++ b/util/grub-install.c
39700a
@@ -256,7 +256,7 @@ static struct argp_option options[] = {
39700a
    OPTION_HIDDEN, 0, 2},
39700a
   {"target", OPTION_TARGET, N_("TARGET"),
39700a
    /* TRANSLATORS: "TARGET" as in "target platform".  */
39700a
-   0, N_("install GRUB for TARGET platform [default=%s]"), 2},
39700a
+   0, N_("install GRUB for TARGET platform [default=%s]; available targets: %s"), 2},
39700a
   {"grub-setup", OPTION_SETUP, "FILE", OPTION_HIDDEN, 0, 2},
39700a
   {"grub-mkrelpath", OPTION_MKRELPATH, "FILE", OPTION_HIDDEN, 0, 2},
39700a
   {"grub-mkdevicemap", OPTION_MKDEVICEMAP, "FILE", OPTION_HIDDEN, 0, 2},
39700a
@@ -340,7 +340,13 @@ help_filter (int key, const char *text, void *input __attribute__ ((unused)))
39700a
     case OPTION_BOOT_DIRECTORY:
39700a
       return xasprintf (text, GRUB_DIR_NAME, GRUB_BOOT_DIR_NAME "/" GRUB_DIR_NAME);
39700a
     case OPTION_TARGET:
39700a
-      return xasprintf (text, get_default_platform ());
39700a
+      {
39700a
+	char *plats = grub_install_get_platforms_string ();
39700a
+	char *ret;
39700a
+	ret = xasprintf (text, get_default_platform (), plats);
39700a
+	free (plats);
39700a
+	return ret;
39700a
+      }
39700a
     case ARGP_KEY_HELP_POST_DOC:
39700a
       return xasprintf (text, program_name, GRUB_BOOT_DIR_NAME "/" GRUB_DIR_NAME);
39700a
     default:
39700a
-- 
39700a
1.9.3
39700a