mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-04 00:57:14 +08:00
52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
diff -Naur /etc/grub.d.orig/10_linux /etc/grub.d/10_linux
|
|
--- /etc/grub.d.orig/10_linux.in 2010-03-16 12:05:22.998499105 +0100
|
|
+++ /etc/grub.d/10_linux.in 2010-03-16 13:26:36.669907054 +0100
|
|
@@ -28,10 +28,10 @@
|
|
CLASS="--class gnu-linux --class gnu --class os"
|
|
|
|
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
|
- OS=GNU/Linux
|
|
+ OS="Chakra Linux"
|
|
else
|
|
- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
|
|
- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}"
|
|
+ OS="${GRUB_DISTRIBUTOR} Chakra Linux"
|
|
+ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' ) ${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,11 +97,12 @@
|
|
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=
|
|
|
|
+
|
|
while [ "x$list" != "x" ] ; do
|
|
linux=`version_find_latest $list`
|
|
echo "Found linux image: $linux" >&2
|
|
@@ -113,9 +114,7 @@
|
|
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 "$(echo $basename|sed 's|vmlinuz|kernel|'|sed 's|$|.img|')"; do
|
|
if test -e "${dirname}/${i}" ; then
|
|
initrd="$i"
|
|
break
|