From eb7892976ce14d7d2f9b5185ff813bf44b31cfba Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Fri, 19 Dec 2003 17:57:55 +0000 Subject: [PATCH] fixed grub git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2024 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + package/x86/grub/grub.conf | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 04540ac77..4cb6c1a74 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -17,6 +17,7 @@ Alpha optimisations selection Documentation/ updates - Juergen Sawinski: fixed gnome-vfs-extras to utilize samba + - fixed grub *) 2003-12-17 (2.0.0-rc3 - 2.0.0-rc4) diff --git a/package/x86/grub/grub.conf b/package/x86/grub/grub.conf index 2d07e9283..33477d4a4 100644 --- a/package/x86/grub/grub.conf +++ b/package/x86/grub/grub.conf @@ -23,13 +23,16 @@ grub_postmake() { mkdir -p $root/boot/grub - cp -v /usr/share/grub/i386-pc/* /boot/grub/ + trg=${arch_target/-linux-gnu} + trg=i386-${trg/i*-/} + + cp -v $datadir/grub/$trg/* $root/boot/grub/ cp $confdir/stone_mod_grub.sh $root/etc/stone.d/mod_grub.sh if [ ! -f $root/boot/grub/menu.lst ] ; then cp docs/menu.lst $root/boot/grub/ fi - cp docs/menu.lst $root/boot/grub/example_menu.lst + cp docs/menu.lst $root/boot/grub/menu.lst.example counter=1 confopt="$confopt --enable-diskless"