Added -no-emul-boot back into x86-archscript.sh as apparently isolinux will not work...

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

diff --git a/ChangeLog b/ChangeLog
index a88f21f2b461525101182ef0c7e65ae2001e132b..ca968f17bbf25664730c1be22cfe6d409d90c855 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.127 2004/12/16 23:13:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.128 2004/12/17 21:06:36 wolf31o2 Exp $
+
+  17 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/runscript/x86-archscript.sh:
+  Added -no-emul-boot back into x86-archscript.sh as apparently isolinux will
+  not work without it (mkisofs fails on creating ISO).
 
   16 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   modules/catalyst_support.py, modules/embedded_target.py,

diff --git a/livecd/runscript/x86-archscript.sh b/livecd/runscript/x86-archscript.sh
index 8af785f2f2b765b296b0f8ece039d81eedc13e29..2ac35add8a7dccf111c3ce23bdb85e669ee00276 100644 (file)
--- a/livecd/runscript/x86-archscript.sh
+++ b/livecd/runscript/x86-archscript.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/livecd/runscript/Attic/x86-archscript.sh,v 1.18 2004/12/12 16:39:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.19 2004/12/17 21:06:36 wolf31o2 Exp $
 
 case $1 in
        kernel)
@@ -110,10 +110,10 @@ case $1 in
                # to build the iso file
                case ${clst_livecd_cdfstype} in
                        zisofs)
-                               mkisofs -J -R -l -o  ${2} -b isolinux/isolinux.bin -c isolinux/boot.cat -boot-load-size 4 -boot-info-table -z ${clst_cdroot_path} || die "Cannot make ISO image"
+                               mkisofs -J -R -l -o  ${2} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -z ${clst_cdroot_path} || die "Cannot make ISO image"
                        ;;
                        *)
-                               mkisofs -J -R -l -o  ${2} -b isolinux/isolinux.bin -c isolinux/boot.cat -boot-load-size 4 -boot-info-table ${clst_cdroot_path} || die "Cannot make ISO image"
+                               mkisofs -J -R -l -o  ${2} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_cdroot_path} || die "Cannot make ISO image"
                        ;;
                esac
                ;;