Fixing some bootloader isolinux/boot stuff for x86/amd64.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@698 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index ba6642f205a311c3189314355303a0f9ee87cc9d..da257f6990ebfab35046c280def8a9d6a23550b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.272 2005/06/14 19:48:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.273 2005/06/16 13:40:01 wolf31o2 Exp $
+
+  16 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/bootloader-setup.sh, targets/support/create-iso.sh:
+  Fixing some bootloader isolinux/boot stuff for x86/amd64.
 
   14 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/chroot-functions.sh:

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 94e065a01d0889ffaeb1a401b0a585ff3e5f1905..9a243b26e1918300acb2e39ffa6375f1a8fa3b6a 100755 (executable)
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -1,6 +1,7 @@
-# Copyright 1999-2004 Gentoo Foundation
+#!/bin/bash
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.4 2005/04/29 14:40:25 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.5 2005/06/16 13:40:01 wolf31o2 Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -89,7 +90,7 @@ case ${clst_mainarch} in
                echo "image=\"cat /boot/help.msg\"" >> ${scfg}
                echo -e "label=\"help\"" >> ${scfg}
                ;;
-       x86)
+       x86|amd64)
                if [ -e $1/boot/isolinux.bin ]
                then
                        # the rest of this function sets up the config file for isolinux
@@ -148,7 +149,7 @@ case ${clst_mainarch} in
                        
                        # Setup help message    
                        hmsg=${clst_sharedir}/livecd/files/x86-help.msg
-                       hmsg_txt=$(cat ${hmsg})
+                       hmsg_txt="$(cat ${hmsg})"
                        
                        echo >> ${icfg}
                        echo "title help" >> ${icfg}

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 3e24bdba3d89dab6ade4c9f3c5b35d73724d3201..aa774e23d65ace8c6adfb2a2676c4df1ed57a2a5 100755 (executable)
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.4 2005/06/01 13:41:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.5 2005/06/16 13:40:01 wolf31o2 Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 #. ${clst_sharedir}/targets/${clst_target}/${clst_mainarch}-archscript.sh
@@ -119,7 +119,7 @@ case ${clst_mainarch} in
                        
                        case ${clst_fstype} in
                                zisofs)
-                                       mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -b boot/isolinux.bin -c boot/boot.cat -no-emul-boot \
+                                       mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot \
                                        -boot-load-size 4 -boot-info-table -z ${clst_target_path} || die "Cannot make ISO image"
                                ;;
                                *)