45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
|
--- grub-2.02_beta3/util/grub.d/10_linux.in.orig 2016-08-25 21:54:04.745747726 +0200
|
||
|
|
+++ grub-2.02_beta3/util/grub.d/10_linux.in 2016-08-25 21:58:24.552485179 +0200
|
||
|
|
@@ -225,8 +225,13 @@
|
||
|
|
fi
|
||
|
|
|
||
|
|
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
|
||
|
|
- linux_entry "${OS}" "${version}" simple \
|
||
|
|
- "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
||
|
|
+ if [ "x${GRUB_DEFAULT_NOMODESET}" = xtrue ]; then
|
||
|
|
+ linux_entry "${OS} (proprietary video driver)" "${version}" nomodeset \
|
||
|
|
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} nomodeset"
|
||
|
|
+ else
|
||
|
|
+ linux_entry "${OS}" "${version}" simple \
|
||
|
|
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
||
|
|
+ fi
|
||
|
|
|
||
|
|
submenu_indentation="$grub_tab"
|
||
|
|
|
||
|
|
@@ -242,8 +247,13 @@
|
||
|
|
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
||
|
|
fi
|
||
|
|
|
||
|
|
- linux_entry "${OS} (proprietary video driver)" "${version}" nomodeset \
|
||
|
|
- "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} nomodeset"
|
||
|
|
+ if [ "x${GRUB_DEFAULT_NOMODESET}" = xtrue ]; then
|
||
|
|
+ linux_entry "${OS}" "${version}" simple \
|
||
|
|
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
||
|
|
+ else
|
||
|
|
+ linux_entry "${OS} (proprietary video driver)" "${version}" nomodeset \
|
||
|
|
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} nomodeset"
|
||
|
|
+ fi
|
||
|
|
|
||
|
|
linux_entry "${OS} (with debug messages)" "${version}" debug \
|
||
|
|
"${GRUB_CMDLINE_LINUX} debug"
|
||
|
|
--- grub-2.02_beta3/util/grub-mkconfig.in.orig 2016-08-25 22:00:24.140179518 +0200
|
||
|
|
+++ grub-2.02_beta3/util/grub-mkconfig.in 2016-08-25 22:25:21.236957757 +0200
|
||
|
|
@@ -230,6 +230,7 @@
|
||
|
|
GRUB_SAVEDEFAULT \
|
||
|
|
GRUB_ENABLE_CRYPTODISK \
|
||
|
|
GRUB_BADRAM \
|
||
|
|
+ GRUB_DEFAULT_NOMODESET \
|
||
|
|
GRUB_OS_PROBER_SKIP_LIST \
|
||
|
|
GRUB_DISABLE_SUBMENU
|
||
|
|
|