47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
|
--- grub-2.00/util/grub.d/10_linux.in.orig 2015-05-28 16:57:21.522901866 +0200
|
||
|
|
+++ grub-2.00/util/grub.d/10_linux.in 2015-05-28 16:59:05.512884781 +0200
|
||
|
|
@@ -227,8 +227,13 @@
|
||
|
|
fi
|
||
|
|
|
||
|
|
if [ "x$is_first_entry" = xtrue ]; 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.00/util/grub-mkconfig.in.orig 2015-05-28 17:00:39.500869649 +0200
|
||
|
|
+++ grub-2.00/util/grub-mkconfig.in 2015-05-28 17:00:56.443866922 +0200
|
||
|
|
@@ -219,7 +219,8 @@
|
||
|
|
GRUB_INIT_TUNE \
|
||
|
|
GRUB_SAVEDEFAULT \
|
||
|
|
GRUB_ENABLE_CRYPTODISK \
|
||
|
|
- GRUB_BADRAM
|
||
|
|
+ GRUB_BADRAM \
|
||
|
|
+ GRUB_DEFAULT_NOMODESET
|
||
|
|
|
||
|
|
if test "x${grub_cfg}" != "x"; then
|
||
|
|
rm -f "${grub_cfg}.new"
|