47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
diff -Nru grub-2.00.orig/util/grub.d/10_linux.in grub-2.00/util/grub.d/10_linux.in
|
|
--- grub-2.00.orig/util/grub.d/10_linux.in 2013-06-09 23:58:16.000000000 +0200
|
|
+++ grub-2.00/util/grub.d/10_linux.in 2014-11-06 10:50:32.485907611 +0100
|
|
@@ -237,15 +237,40 @@
|
|
fi
|
|
# TRANSLATORS: %s is replaced with an OS name
|
|
echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
|
|
+ else
|
|
+ linux_entry "${OS}" "${version}" default \
|
|
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
fi
|
|
|
|
- linux_entry "${OS}" "${version}" advanced \
|
|
- "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
+ linux_entry "${OS} (proprietary video driver)" "${version}" nomodeset \
|
|
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} nomodeset"
|
|
+
|
|
+ linux_entry "${OS} (with debug messages)" "${version}" debug \
|
|
+ "${GRUB_CMDLINE_LINUX} debug"
|
|
+
|
|
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
|
|
linux_entry "${OS}" "${version}" recovery \
|
|
"single ${GRUB_CMDLINE_LINUX}"
|
|
fi
|
|
|
|
+ initrd=
|
|
+ for i in "initramfs-${version}-failsafe.img.gz" "initramfs-${alt_version}-failsafe.img.gz" \
|
|
+ "initramfs-${version}-failsafe.img" "initramfs-${alt_version}-failsafe.img" \
|
|
+ "initramfs-${version}-failsafe.cpio.gz" "initramfs-${alt_version}-failsafe.cpio.gz"; do
|
|
+ if test -e "${dirname}/${i}" ; then
|
|
+ initrd="$i"
|
|
+ break
|
|
+ fi
|
|
+ done
|
|
+ if test -n "${initrd}" ; then
|
|
+ gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
|
|
+ linux_entry "${OS} (failsafe)" "${version}" advanced \
|
|
+ "rddebug splash selinux=0 ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
+ fi
|
|
+ echo -e "\tmenuentry ' ' {"
|
|
+ echo -e "\t\ttrue"
|
|
+ echo -e "\t}"
|
|
+
|
|
list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
|
|
is_first_entry=false
|
|
done
|