From: Chris Gianelloni Date: Fri, 17 Dec 2004 21:06:36 +0000 (+0000) Subject: Added -no-emul-boot back into x86-archscript.sh as apparently isolinux will not work... X-Git-Tag: CATALYST_2_0_6_916~873 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6b8cdd44a4ad620c810ff4be5628e59a889118e4;p=catalyst.git Added -no-emul-boot back into x86-archscript.sh as apparently isolinux will not work without it (mkisofs fails on creating ISO). 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 a88f21f2..ca968f17 100644 --- 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 + 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 catalyst, modules/catalyst_support.py, modules/embedded_target.py, diff --git a/livecd/runscript/x86-archscript.sh b/livecd/runscript/x86-archscript.sh index 8af785f2..2ac35add 100644 --- 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 ;;