From 87e748cb1e08102dd9f9616e1e9416b011a4e925 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Wed, 6 Feb 2008 13:25:36 -0300 Subject: [PATCH] Adapted grub/boot/boot.in to use boot_cd_*() and to take files for grub/boot instead of architecture/x86/boot --- x86/grub/boot/boot.in | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/x86/grub/boot/boot.in b/x86/grub/boot/boot.in index e9ef6b7a3..ae23fa429 100644 --- a/x86/grub/boot/boot.in +++ b/x86/grub/boot/boot.in @@ -13,19 +13,18 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- - -arch_boot_cd_pre() +boot_cd_pre() { mkdir -p $isofsdir/boot/grub cp -f $build_root/boot/grub/stage{1,2,2_eltorito} $isofsdir/boot/grub/ cp -f $build_root/boot/opensde-grub-splash.xpm.gz $isofsdir/boot/ # header - sed -n '/CUT/q;p' $base/architecture/x86/boot/menu.lst \ + sed -n '/CUT/q;p' $base/package/$bootloader/boot/menu.lst \ > $1/boot/grub/menu.lst } -arch_boot_cd_add() +boot_cd_add() { cat >> $1/boot/grub/menu.lst <<-EOT @@ -36,10 +35,10 @@ initrd (cd)$5 EOT } -arch_boot_cd_post() +boot_cd_post() { # footer - sed '1,/CUT/d' $base/architecture/x86/boot/menu.lst \ + sed '1,/CUT/d' $base/package/$bootloader/boot/menu.lst \ >> $1/boot/grub/menu.lst echo_status "Creating isofs_arch.txt file .."