mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-03 14:57:14 +08:00
60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
diff -ur grub-1.98.orig/util/grub.d/10_linux.in grub-1.98/util/grub.d/10_linux.in
|
|
--- grub-1.98.orig/util/grub.d/10_linux.in 2010-03-13 22:10:15.953099258 -0400
|
|
+++ grub-1.98/util/grub.d/10_linux.in 2010-03-13 22:10:44.217896122 -0400
|
|
@@ -30,8 +30,8 @@
|
|
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]') ${CLASS}"
|
|
+ OS="${GRUB_DISTRIBUTOR}"
|
|
+ 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
|
|
@@ -46,7 +46,7 @@
|
|
|| ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ; 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
|
|
|
|
linux_entry ()
|
|
@@ -97,7 +97,7 @@
|
|
EOF
|
|
}
|
|
|
|
-list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
|
|
+list=`for i in /boot/vmlinu[xz]* /vmlinu[xz]* ; do
|
|
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
|
|
done`
|
|
prepare_boot_cache=
|
|
@@ -109,13 +109,12 @@
|
|
dirname=`dirname $linux`
|
|
rel_dirname=`make_system_path_relative_to_its_root $dirname`
|
|
version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
|
|
- alt_version=`echo $version | sed -e "s,\.old$,,g"`
|
|
+ base_init=`echo $basename | sed -e "s,vmlinuz,kernel,g"`
|
|
+ alt_version="${base_init}-fallback"
|
|
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
|
|
|
|
initrd=
|
|
- for i in "initrd.img-${version}" "initrd-${version}.img" \
|
|
- "initrd-${version}" "initrd.img-${alt_version}" \
|
|
- "initrd-${alt_version}.img" "initrd-${alt_version}"; do
|
|
+ for i in "${base_init}.img"; do
|
|
if test -e "${dirname}/${i}" ; then
|
|
initrd="$i"
|
|
break
|
|
@@ -130,6 +129,9 @@
|
|
|
|
linux_entry "${OS}" "${version}" false \
|
|
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
+ initrd="${alt_version}.img"
|
|
+ linux_entry "${OS}" "${version} Fallback" false \
|
|
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
if [ "x${GRUB_DISABLE_LINUX_RECOVERY}" != "xtrue" ]; then
|
|
linux_entry "${OS}" "${version}" true \
|
|
"single ${GRUB_CMDLINE_LINUX}"
|