8c6b1ac71e
Also include some minor fixes for gcc 5.1.1 Signed-off-by: Peter Jones <pjones@redhat.com>
163 lines
5.1 KiB
Diff
163 lines
5.1 KiB
Diff
From 0aece00c54aa6a6ac316c619a1ad31ec3190aca2 Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Sun, 21 Sep 2014 17:49:13 +0200
|
|
Subject: [PATCH 102/506] * grub-core/osdep/unix/config.c: Remove
|
|
extraneous comma.
|
|
|
|
---
|
|
ChangeLog | 6 +++++-
|
|
grub-core/commands/keylayouts.c | 4 +++-
|
|
grub-core/gmodule.pl.in | 2 +-
|
|
grub-core/normal/main.c | 10 +++++++---
|
|
grub-core/normal/menu.c | 2 +-
|
|
grub-core/normal/menu_entry.c | 2 +-
|
|
grub-core/osdep/unix/config.c | 4 ++--
|
|
grub-core/tests/cmdline_cat_test.c | 2 +-
|
|
include/grub/normal.h | 2 +-
|
|
9 files changed, 22 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 1c79b77..bac248c 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,4 +1,8 @@
|
|
-2014-21-15 Peter Jones <pjones@redhat.com>
|
|
+2014-09-21 Michael Chang <mchang@suse.com>
|
|
+
|
|
+ * grub-core/osdep/unix/config.c: Remove extraneous comma.
|
|
+
|
|
+2014-09-21 Peter Jones <pjones@redhat.com>
|
|
|
|
* grub-core/loader/arm/linux.c: Initialized initrd_ctx so
|
|
we don't free a random pointer from the stack.
|
|
diff --git a/grub-core/commands/keylayouts.c b/grub-core/commands/keylayouts.c
|
|
index da04389..f4b7730 100644
|
|
--- a/grub-core/commands/keylayouts.c
|
|
+++ b/grub-core/commands/keylayouts.c
|
|
@@ -173,8 +173,10 @@ grub_term_map_key (grub_keyboard_key_t code, int status)
|
|
|
|
key = map_key_core (code, status, &alt_gr_consumed);
|
|
|
|
- if (key == 0 || key == GRUB_TERM_SHIFT)
|
|
+ if (key == 0 || key == GRUB_TERM_SHIFT) {
|
|
grub_printf ("Unknown key 0x%x detected\n", code);
|
|
+ return GRUB_TERM_NO_KEY;
|
|
+ }
|
|
|
|
if (status & GRUB_TERM_STATUS_CAPS)
|
|
{
|
|
diff --git a/grub-core/gmodule.pl.in b/grub-core/gmodule.pl.in
|
|
index 6739a6f..78aa1e6 100644
|
|
--- a/grub-core/gmodule.pl.in
|
|
+++ b/grub-core/gmodule.pl.in
|
|
@@ -23,7 +23,7 @@ while (<>) {
|
|
}
|
|
|
|
print " -s $2 $sections{$1}"
|
|
- if ($sections{$1} ne '0x0');
|
|
+ if ($sections{$1} ne '0x0' and $sections{$1} ne '');
|
|
};
|
|
close (READELF);
|
|
print "\n";
|
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
|
index 3a926fc..c41f175 100644
|
|
--- a/grub-core/normal/main.c
|
|
+++ b/grub-core/normal/main.c
|
|
@@ -302,7 +302,7 @@ grub_enter_normal_mode (const char *config)
|
|
nested_level++;
|
|
grub_normal_execute (config, 0, 0);
|
|
grub_boot_time ("Entering shell");
|
|
- grub_cmdline_run (0);
|
|
+ grub_cmdline_run (0, 1);
|
|
nested_level--;
|
|
if (grub_normal_exit_level)
|
|
grub_normal_exit_level--;
|
|
@@ -424,11 +424,15 @@ grub_normal_read_line (char **line, int cont,
|
|
}
|
|
|
|
void
|
|
-grub_cmdline_run (int nested)
|
|
+grub_cmdline_run (int nested, int force_auth)
|
|
{
|
|
grub_err_t err = GRUB_ERR_NONE;
|
|
|
|
- err = grub_auth_check_authentication (NULL);
|
|
+ do
|
|
+ {
|
|
+ err = grub_auth_check_authentication (NULL);
|
|
+ }
|
|
+ while (err && force_auth);
|
|
|
|
if (err)
|
|
{
|
|
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
|
|
index b47991a..719e2fb 100644
|
|
--- a/grub-core/normal/menu.c
|
|
+++ b/grub-core/normal/menu.c
|
|
@@ -773,7 +773,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
|
|
|
|
case 'c':
|
|
menu_fini ();
|
|
- grub_cmdline_run (1);
|
|
+ grub_cmdline_run (1, 0);
|
|
goto refresh;
|
|
|
|
case 'e':
|
|
diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
|
|
index b485df8..62c7e16 100644
|
|
--- a/grub-core/normal/menu_entry.c
|
|
+++ b/grub-core/normal/menu_entry.c
|
|
@@ -1396,7 +1396,7 @@ grub_menu_entry_run (grub_menu_entry_t entry)
|
|
|
|
case GRUB_TERM_CTRL | 'c':
|
|
case GRUB_TERM_KEY_F2:
|
|
- grub_cmdline_run (1);
|
|
+ grub_cmdline_run (1, 0);
|
|
goto refresh;
|
|
|
|
case GRUB_TERM_CTRL | 'x':
|
|
diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
|
|
index f4b0bb4..65effa9 100644
|
|
--- a/grub-core/osdep/unix/config.c
|
|
+++ b/grub-core/osdep/unix/config.c
|
|
@@ -105,8 +105,8 @@ grub_util_load_config (struct grub_util_config *cfg)
|
|
*ptr++ = *iptr;
|
|
}
|
|
|
|
- strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\n\", "
|
|
- "\"$GRUB_ENABLE_CRYPTODISK\", \"$GRUB_DISTRIBUTOR\"");
|
|
+ strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\n\" "
|
|
+ "\"$GRUB_ENABLE_CRYPTODISK\" \"$GRUB_DISTRIBUTOR\"");
|
|
|
|
argv[2] = script;
|
|
argv[3] = '\0';
|
|
diff --git a/grub-core/tests/cmdline_cat_test.c b/grub-core/tests/cmdline_cat_test.c
|
|
index c3de5c4..f1e2143 100644
|
|
--- a/grub-core/tests/cmdline_cat_test.c
|
|
+++ b/grub-core/tests/cmdline_cat_test.c
|
|
@@ -109,7 +109,7 @@ cmdline_cat_test (void)
|
|
grub_video_checksum ("cmdline_cat");
|
|
|
|
if (!grub_test_use_gfxterm ())
|
|
- grub_cmdline_run (1);
|
|
+ grub_cmdline_run (1, 0);
|
|
|
|
grub_test_use_gfxterm_end ();
|
|
|
|
diff --git a/include/grub/normal.h b/include/grub/normal.h
|
|
index c4ab193..218cbab 100644
|
|
--- a/include/grub/normal.h
|
|
+++ b/include/grub/normal.h
|
|
@@ -66,7 +66,7 @@ void grub_menu_init_page (int nested, int edit,
|
|
struct grub_term_output *term);
|
|
void grub_normal_init_page (struct grub_term_output *term, int y);
|
|
char *grub_file_getline (grub_file_t file);
|
|
-void grub_cmdline_run (int nested);
|
|
+void grub_cmdline_run (int nested, int force_auth);
|
|
|
|
/* Defined in `cmdline.c'. */
|
|
char *grub_cmdline_get (const char *prompt);
|
|
--
|
|
2.4.3
|
|
|