mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-13 23:59:02 +08:00
116 lines
4.2 KiB
Diff
116 lines
4.2 KiB
Diff
diff -Naur a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
|
--- a/util/grub-mkconfig.in 2011-12-03 21:37:37.148786544 +0000
|
|
+++ b/util/grub-mkconfig.in 2011-12-03 21:37:48.445392013 +0000
|
|
@@ -252,6 +252,8 @@
|
|
GRUB_THEME \
|
|
GRUB_GFXPAYLOAD_LINUX \
|
|
GRUB_DISABLE_OS_PROBER \
|
|
+ GRUB_COLOR_NORMAL \
|
|
+ GRUB_COLOR_HIGHLIGHT \
|
|
GRUB_INIT_TUNE \
|
|
GRUB_SAVEDEFAULT \
|
|
GRUB_BADRAM
|
|
diff -Naur a/util/grub.d/00_header.in b/util/grub.d/00_header.in
|
|
--- a/util/grub.d/00_header.in 2011-12-03 21:37:37.148786544 +0000
|
|
+++ b/util/grub.d/00_header.in 2011-12-03 21:37:48.445392013 +0000
|
|
@@ -100,6 +100,14 @@
|
|
|
|
EOF
|
|
|
|
+if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then
|
|
+ cat << EOF
|
|
+set menu_color_normal=$GRUB_COLOR_NORMAL
|
|
+set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT
|
|
+
|
|
+EOF
|
|
+fi
|
|
+
|
|
serial=0;
|
|
gfxterm=0;
|
|
for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
|
|
diff -Naur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
--- a/util/grub.d/10_linux.in 2011-12-03 21:37:37.148786544 +0000
|
|
+++ b/util/grub.d/10_linux.in 2011-12-03 21:40:36.621147593 +0000
|
|
@@ -31,8 +31,8 @@ CLASS="--class gnu-linux --class gnu --c
|
|
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
|
OS=GNU/Linux
|
|
else
|
|
- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
|
|
- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
|
|
+ OS="${GRUB_DISTRIBUTOR} Linux"
|
|
+ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | tr -d ' ') ${CLASS}"
|
|
fi
|
|
|
|
# loop-AES arranges things so that /dev/loop/X can be our root device, but
|
|
@@ -49,7 +49,7 @@ if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue"
|
|
|| uses_abstraction "${GRUB_DEVICE}" lvm; then
|
|
LINUX_ROOT_DEVICE=${GRUB_DEVICE}
|
|
else
|
|
- LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
|
|
+ LINUX_ROOT_DEVICE="/dev/disk/by-uuid/${GRUB_DEVICE_UUID}"
|
|
fi
|
|
|
|
if [ "x`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" = xbtrfs ]; then
|
|
@@ -65,12 +65,19 @@ linux_entry ()
|
|
version="$2"
|
|
recovery="$3"
|
|
args="$4"
|
|
- if ${recovery} ; then
|
|
- title="$(gettext_quoted "%s, with Linux %s (recovery mode)")"
|
|
+ if [ "${version}" = "lts" ] ; then
|
|
+ _kernel=LTS
|
|
else
|
|
- title="$(gettext_quoted "%s, with Linux %s")"
|
|
+ _kernel=Standard
|
|
fi
|
|
- printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}"
|
|
+ if [ -n "$5" ] ; then
|
|
+ title="$(gettext_quoted "%s, with ${_kernel}-Kernel") $5"
|
|
+ elif ${recovery} ; then
|
|
+ title="$(gettext_quoted "%s, with ${_kernel}-Kernel (recovery mode)")"
|
|
+ else
|
|
+ title="$(gettext_quoted "%s, with ${_kernel}-Kernel")"
|
|
+ fi
|
|
+ printf "menuentry '${title}' ${CLASS} {\n" "${os}"
|
|
if ! ${recovery} ; then
|
|
save_default_entry | sed -e "s/^/\t/"
|
|
fi
|
|
@@ -132,7 +139,7 @@ EOF
|
|
|
|
case x`uname -m` in
|
|
xi?86 | xx86_64)
|
|
- list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
|
|
+ list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* ; do
|
|
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
|
|
done` ;;
|
|
*)
|
|
@@ -159,8 +166,11 @@ while [ "x$list" != "x" ] ; do
|
|
"initrd-${version}" "initramfs-${version}.img" \
|
|
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
|
|
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
|
|
+ "initramfs-linux-${version}" "initramfs-linux-${version}.img" \
|
|
+ "initramfs-linux-${alt_version}" "initramfs-linux-${alt_version}.img" \
|
|
"initramfs-genkernel-${version}" \
|
|
- "initramfs-genkernel-${alt_version}"; do
|
|
+ "initramfs-genkernel-${alt_version}" \
|
|
+ "${basename/vmlinuz/kernel}.img"; do
|
|
if test -e "${dirname}/${i}" ; then
|
|
initrd="$i"
|
|
break
|
|
@@ -190,6 +200,15 @@ while [ "x$list" != "x" ] ; do
|
|
|
|
linux_entry "${OS}" "${version}" false \
|
|
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
+ for i in "initramfs-${version}-fallback.img" \
|
|
+ "initramfs-linux-${alt_version}-fallback.img"; do
|
|
+ if test -e "${dirname}/${i}"; then
|
|
+ initrd="$i"
|
|
+ linux_entry "${OS}" "${version}" true \
|
|
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" Fallback
|
|
+ break
|
|
+ fi
|
|
+ done
|
|
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
|
|
linux_entry "${OS}" "${version}" true \
|
|
"single ${GRUB_CMDLINE_LINUX}"
|