From: Andrei Borzenkov <arvidjaar@gmail.com>
Date: Sun, 8 Jan 2017 12:52:49 +0000 (+0300)
Subject: linux: fix "vga=XX deprecated" warning for text mode
X-Git-Tag: 2.02-rc1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=972765fe8245cdf44d465329f33b5aa9ac6c2f47;p=thirdparty%2Fgrub.git

linux: fix "vga=XX deprecated" warning for text mode

Arguments were in reverse order which resulted in

text is deprecated. Use set gfxpayload=vga=0 before linux command instead.
---

diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index fddcc461d..b15b8cca5 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -915,8 +915,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 	    grub_env_set ("gfxpayload", "text");
 	    grub_printf_ (N_("%s is deprecated. "
 			     "Use set gfxpayload=%s before "
-			     "linux command instead.\n"), "text",
-			  argv[i]);
+			     "linux command instead.\n"),
+			  argv[i], "text");
 	    break;
 
 	  case 1:
@@ -925,8 +925,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 	    grub_env_set ("gfxpayload", "text");
 	    grub_printf_ (N_("%s is deprecated. "
 			     "Use set gfxpayload=%s before "
-			     "linux command instead.\n"), "text",
-			  argv[i]);
+			     "linux command instead.\n"),
+			  argv[i], "text");
 	    break;
 	  default:
 	    /* Ignore invalid values.  */