Making sure the mkisofs call causes a failure when it doesn't complete successfully...

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

diff --git a/ChangeLog b/ChangeLog
index f8ea20d006584fafb004077bd4343508344f3c67..3efe643ebfa77411aafe5df53e5def521edb4cca 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.119 2004/12/12 16:17:02 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.120 2004/12/12 16:32:06 wolf31o2 Exp $
+
+  12 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/runscript/x86-archscript.sh:
+  Making sure the mkisofs call causes a failure when it doesn't complete
+  successfully. Once again, blame jforman, our beloved infra-monkey.
 
   12 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/runscript/default-runscript.sh:

diff --git a/livecd/runscript/x86-archscript.sh b/livecd/runscript/x86-archscript.sh
index ead3ea13887eeed78c600a64c21ca00b515bb478..41f927b7e893edec2ebe07a8eaf368b021b636ec 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.16 2004/12/09 14:05:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.17 2004/12/12 16:32:06 wolf31o2 Exp $
 
 case $1 in
        kernel)
@@ -107,6 +107,6 @@ case $1 in
 
        iso)
                #this is for the livecd-stage2 target, and calls the proper command to build the iso file
-               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}
+               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"
                ;;
 esac