mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-03 14:27:13 +08:00
Fixing detection of Chakra kernels in grub2.
This commit is contained in:
Daniele
parent
bb71ba8654
commit
5dbaee10a3
@ -13,7 +13,7 @@ _grub2_915_ver=7
|
||||
pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-x32')
|
||||
pkgbase="grub2"
|
||||
pkgver='1.99'
|
||||
pkgrel=4
|
||||
pkgrel=5
|
||||
url="http://www.gnu.org/software/grub/"
|
||||
arch=('i686' 'x86_64')
|
||||
license=('GPL3')
|
||||
@ -44,8 +44,8 @@ sha1sums=('a5ae9558f30ce7757a76aa130088b053a87e2fb6'
|
||||
'6c58eee654fa4eb7f057275b330710ffd4a9e989'
|
||||
'0e50955141a45918fcf56f3a5e15fb477f0448a7'
|
||||
'f2a5f1d5b75bd3286b63aefaf5e6553aa03e772b'
|
||||
'b7e5510c7b171e9c4dbddb42bbf54ce5ee86e2de'
|
||||
'e1477db3700b27b5e5ad3d8fa43028555204759b'
|
||||
'd44bb9c9b95a6999560d3b7300e05e14e85fcfc6'
|
||||
'b517e8ce88e2edfdf97129a03a747258d4a2b44d'
|
||||
'8948d89537c12a4202df7c001e65a77030bbe5a3'
|
||||
'82a27eca5277218cf57c6c5767e0b17a72f62229'
|
||||
'beb31419045db70fee7401aa6448c220a491e2a3'
|
||||
|
||||
43
grub2/chakra_grub2_mkconfig_fixes.patch
Executable file → Normal file
43
grub2/chakra_grub2_mkconfig_fixes.patch
Executable file → Normal file
@ -1,6 +1,18 @@
|
||||
diff -Nur a/util/grub.d/00_header.in b/util/grub.d/00_header.in
|
||||
--- a/util/grub.d/00_header.in 2011-04-06 13:14:27.000000000 +0200
|
||||
+++ b/util/grub.d/00_header.in 2011-08-01 15:19:57.919100452 +0200
|
||||
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
|
||||
@ -16,9 +28,9 @@ diff -Nur a/util/grub.d/00_header.in b/util/grub.d/00_header.in
|
||||
serial=0;
|
||||
gfxterm=0;
|
||||
for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
|
||||
diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||
--- a/util/grub.d/10_linux.in 2011-05-14 22:36:49.000000000 +0200
|
||||
+++ b/util/grub.d/10_linux.in 2011-08-01 15:56:53.324779083 +0200
|
||||
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 @@
|
||||
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
||||
OS=GNU/Linux
|
||||
@ -50,9 +62,12 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
|
||||
done` ;;
|
||||
*)
|
||||
@@ -160,7 +162,8 @@
|
||||
@@ -159,8 +161,11 @@
|
||||
"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}" \
|
||||
@ -60,7 +75,7 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||
if test -e "${dirname}/${i}" ; then
|
||||
initrd="$i"
|
||||
break
|
||||
@@ -190,6 +193,15 @@
|
||||
@@ -190,6 +195,15 @@
|
||||
|
||||
linux_entry "${OS}" "${version}" false \
|
||||
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
||||
@ -76,15 +91,3 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
|
||||
linux_entry "${OS}" "${version}" true \
|
||||
"single ${GRUB_CMDLINE_LINUX}"
|
||||
diff -Nur a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
||||
--- a/util/grub-mkconfig.in 2011-04-06 17:45:53.000000000 +0200
|
||||
+++ b/util/grub-mkconfig.in 2011-08-01 15:20:49.256867648 +0200
|
||||
@@ -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
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
GRUB_DEFAULT=0
|
||||
GRUB_TIMEOUT=5
|
||||
GRUB_DISTRIBUTOR="Arch Linux"
|
||||
GRUB_DISTRIBUTOR="Chakra Linux"
|
||||
GRUB_CMDLINE_LINUX_DEFAULT="quiet"
|
||||
GRUB_CMDLINE_LINUX=""
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
infodir=usr/share/info
|
||||
filelist=(grub.info grub-dev.info)
|
||||
|
||||
wisperer() {
|
||||
show_important_message() {
|
||||
echo -e "\033[0;31m IMPORTANT"
|
||||
echo -e "\033[0;0m Run \033[0;32m 'grub-install /dev/sda --no-floppy' \033[0;0m as root for installing in MBR"
|
||||
echo -e "\033[0;0m Run \033[0;32m 'grub-mkconfig -o /boot/grub/grub.cfg' \033[0;0m as root for generating grub.cfg"
|
||||
@ -45,7 +45,7 @@ post_install() {
|
||||
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
|
||||
done
|
||||
delete_symlinks
|
||||
wisperer
|
||||
show_important_message
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
@ -53,7 +53,7 @@ post_upgrade() {
|
||||
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
|
||||
done
|
||||
delete_symlinks
|
||||
wisperer
|
||||
show_important_message
|
||||
if [ -f /boot/grub/grub.cfg ]
|
||||
then
|
||||
update-grub
|
||||
|
||||
Loading…
Reference in New Issue
Block a user