* grub-core/osdep/unix/config.c: Remove extraneous comma.

diff --git a/ChangeLog b/ChangeLog
index 1c79b7789b4c9fe25d03f6196a5c57e42e39e44e..bac248c75f7879cd0474f623d3e6f971ac4240a7 100644 (file)
--- 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 da04389e31712f5e5363f25d20ffa6c803a4f3c5..f4b7730208ab8ffafb1b0283294a140248839d7a 100644 (file)
--- 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 6739a6f1c95870ee9ae6609cbe5c862fda55e311..78aa1e64eb29126f1bf97a7b5ecd7582d7ae5905 100644 (file)
--- 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 3a926fc5fa9eccef9968d524eb710a7e28f5fee7..c41f175bd9f33fe3a1f032ae25079ac58913ce89 100644 (file)
--- 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 b47991ababa4693e455a28e845237c13c9d10487..719e2fb1c260b16d96cea2b787d7f7e592b428b7 100644 (file)
--- 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 b485df821226fb4fe5ded3c25bba888e882ca087..62c7e16274b78df4cd7bf009f069a0cff5871a38 100644 (file)
--- 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 f4b0bb466f773897521aae2739789da6a32b747c..65effa9f3a70d836b7f6bda6c265f0867a683470 100644 (file)
--- 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 c3de5c464084381ee17cbe8383753fb7b9438be1..f1e21439e2be229d386cb310d62164fc9a5f4f92 100644 (file)
--- 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 c4ab193b3f44edb62ba2c07813ea73af9f49da40..218cbabccafb1629753950afd3540fe5d1a4a6c2 100644 (file)
--- 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);