1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278
|
From b8abd22d1aff08c42d512d8ae749315341fdd2e5 Mon Sep 17 00:00:00 2001
From: Evan Broder <evan@ebroder.net>
Date: Mon, 13 Jan 2014 12:13:29 +0000
Subject: Add configure option to enable gfxpayload=keep dynamically
Set GRUB_GFXPAYLOAD_LINUX=keep unless it's known to be unsupported on
the current hardware. See
https://blueprints.launchpad.net/ubuntu/+spec/packageselection-foundations-n-grub2-boot-framebuffer.
Author: Colin Watson <cjwatson@ubuntu.com>
Forwarded: no
Last-Update: 2013-12-25
Patch-Name: gfxpayload_dynamic.patch
---
configure.ac | 11 +++
grub-core/Makefile.core.def | 9 +++
grub-core/commands/i386/pc/hwmatch.c | 146 +++++++++++++++++++++++++++++++++++
util/grub.d/10_linux.in | 37 ++++++++-
4 files changed, 200 insertions(+), 3 deletions(-)
create mode 100644 grub-core/commands/i386/pc/hwmatch.c
diff --git a/configure.ac b/configure.ac
index 48364fe06..622b8fd31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1819,6 +1819,17 @@ else
fi
AC_SUBST([QUICK_BOOT])
+AC_ARG_ENABLE([gfxpayload-dynamic],
+ [AS_HELP_STRING([--enable-gfxpayload-dynamic],
+ [use GRUB_GFXPAYLOAD_LINUX=keep unless explicitly unsupported on current hardware (default=no)])],
+ [], [enable_gfxpayload_dynamic=no])
+if test x"$enable_gfxpayload_dynamic" = xyes ; then
+ GFXPAYLOAD_DYNAMIC=1
+else
+ GFXPAYLOAD_DYNAMIC=0
+fi
+AC_SUBST([GFXPAYLOAD_DYNAMIC])
+
LIBS=""
AC_SUBST([FONT_SOURCE])
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 2344a5e63..6b047109b 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -888,6 +888,15 @@ module = {
};
module = {
+ name = hwmatch;
+ i386_pc = commands/i386/pc/hwmatch.c;
+ enable = i386_pc;
+ common = gnulib/regex.c;
+ cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+ cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
+};
+
+module = {
name = keystatus;
common = commands/keystatus.c;
};
diff --git a/grub-core/commands/i386/pc/hwmatch.c b/grub-core/commands/i386/pc/hwmatch.c
new file mode 100644
index 000000000..c9f7c9f19
--- /dev/null
+++ b/grub-core/commands/i386/pc/hwmatch.c
@@ -0,0 +1,146 @@
+/* hwmatch.c - Match hardware against a whitelist/blacklist. */
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2011 Free Software Foundation, Inc.
+ *
+ * GRUB is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GRUB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/dl.h>
+#include <grub/misc.h>
+#include <grub/command.h>
+#include <grub/pci.h>
+#include <grub/normal.h>
+#include <grub/file.h>
+#include <grub/env.h>
+#include <grub/i18n.h>
+#include <regex.h>
+
+GRUB_MOD_LICENSE ("GPLv3+");
+
+/* Context for grub_cmd_hwmatch. */
+struct hwmatch_ctx
+{
+ grub_file_t matches_file;
+ int class_match;
+ int match;
+};
+
+/* Helper for grub_cmd_hwmatch. */
+static int
+hwmatch_iter (grub_pci_device_t dev, grub_pci_id_t pciid, void *data)
+{
+ struct hwmatch_ctx *ctx = data;
+ grub_pci_address_t addr;
+ grub_uint32_t class, baseclass, vendor, device;
+ grub_pci_id_t subpciid;
+ grub_uint32_t subvendor, subdevice, subclass;
+ char *id, *line;
+
+ addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
+ class = grub_pci_read (addr);
+ baseclass = class >> 24;
+
+ if (ctx->class_match != baseclass)
+ return 0;
+
+ vendor = pciid & 0xffff;
+ device = pciid >> 16;
+
+ addr = grub_pci_make_address (dev, GRUB_PCI_REG_SUBVENDOR);
+ subpciid = grub_pci_read (addr);
+
+ subclass = (class >> 16) & 0xff;
+ subvendor = subpciid & 0xffff;
+ subdevice = subpciid >> 16;
+
+ id = grub_xasprintf ("v%04xd%04xsv%04xsd%04xbc%02xsc%02x",
+ vendor, device, subvendor, subdevice,
+ baseclass, subclass);
+
+ grub_file_seek (ctx->matches_file, 0);
+ while ((line = grub_file_getline (ctx->matches_file)) != NULL)
+ {
+ char *anchored_line;
+ regex_t regex;
+ int ret;
+
+ if (! *line || *line == '#')
+ {
+ grub_free (line);
+ continue;
+ }
+
+ anchored_line = grub_xasprintf ("^%s$", line);
+ ret = regcomp (®ex, anchored_line, REG_EXTENDED | REG_NOSUB);
+ grub_free (anchored_line);
+ if (ret)
+ {
+ grub_free (line);
+ continue;
+ }
+
+ ret = regexec (®ex, id, 0, NULL, 0);
+ regfree (®ex);
+ grub_free (line);
+ if (! ret)
+ {
+ ctx->match = 1;
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
+static grub_err_t
+grub_cmd_hwmatch (grub_command_t cmd __attribute__ ((unused)),
+ int argc, char **args)
+{
+ struct hwmatch_ctx ctx = { .match = 0 };
+ char *match_str;
+
+ if (argc < 2)
+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "list file and class required");
+
+ ctx.matches_file = grub_file_open (args[0]);
+ if (! ctx.matches_file)
+ return grub_errno;
+
+ ctx.class_match = grub_strtol (args[1], 0, 10);
+
+ grub_pci_iterate (hwmatch_iter, &ctx);
+
+ match_str = grub_xasprintf ("%d", ctx.match);
+ grub_env_set ("match", match_str);
+ grub_free (match_str);
+
+ grub_file_close (ctx.matches_file);
+
+ return GRUB_ERR_NONE;
+}
+
+static grub_command_t cmd;
+
+GRUB_MOD_INIT(hwmatch)
+{
+ cmd = grub_register_command ("hwmatch", grub_cmd_hwmatch,
+ N_("MATCHES-FILE CLASS"),
+ N_("Match PCI devices."));
+}
+
+GRUB_MOD_FINI(hwmatch)
+{
+ grub_unregister_command (cmd);
+}
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index b32cc53b0..402c5629d 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -23,6 +23,7 @@ datarootdir="@datarootdir@"
ubuntu_recovery="@UBUNTU_RECOVERY@"
quiet_boot="@QUIET_BOOT@"
quick_boot="@QUICK_BOOT@"
+gfxpayload_dynamic="@GFXPAYLOAD_DYNAMIC@"
. "$pkgdatadir/grub-mkconfig_lib"
@@ -135,9 +136,10 @@ linux_entry ()
if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
echo " load_video" | sed "s/^/$submenu_indentation/"
fi
- if [ "$ubuntu_recovery" = 0 ] || [ x$type != xrecovery ]; then
- echo " set gfxpayload=$GRUB_GFXPAYLOAD_LINUX" | sed "s/^/$submenu_indentation/"
- fi
+ fi
+ if ([ "$ubuntu_recovery" = 0 ] || [ x$type != xrecovery ]) && \
+ ([ "x$GRUB_GFXPAYLOAD_LINUX" != x ] || [ "$gfxpayload_dynamic" = 1 ]); then
+ echo " set gfxpayload=\$linux_gfx_mode" | sed "s/^/$submenu_indentation/"
fi
echo " insmod gzio" | sed "s/^/$submenu_indentation/"
@@ -212,6 +214,35 @@ prepare_root_cache=
boot_device_id=
title_correction_code=
+# Use ELILO's generic "efifb" when it's known to be available.
+# FIXME: We need an interface to select vesafb in case efifb can't be used.
+if [ "x$GRUB_GFXPAYLOAD_LINUX" != x ] || [ "$gfxpayload_dynamic" = 0 ]; then
+ echo "set linux_gfx_mode=$GRUB_GFXPAYLOAD_LINUX"
+else
+ cat << EOF
+if [ "\${recordfail}" != 1 ]; then
+ if [ -e \${prefix}/gfxblacklist.txt ]; then
+ if hwmatch \${prefix}/gfxblacklist.txt 3; then
+ if [ \${match} = 0 ]; then
+ set linux_gfx_mode=keep
+ else
+ set linux_gfx_mode=text
+ fi
+ else
+ set linux_gfx_mode=text
+ fi
+ else
+ set linux_gfx_mode=keep
+ fi
+else
+ set linux_gfx_mode=text
+fi
+EOF
+fi
+cat << EOF
+export linux_gfx_mode
+EOF
+
# Extra indentation to add to menu entries in a submenu. We're not in a submenu
# yet, so it's empty. In a submenu it will be equal to '\t' (one tab).
submenu_indentation=""
|