From 60e657e028dd1c7c9c9c29e9bd01a462a8c12c9b Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Sun, 12 Dec 2004 16:39:11 +0000 Subject: [PATCH] Added failures to all arches on mkisofs failure and also made -z option to mkisofs optional on x86 depending on loop type used. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@491 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 10 +++++++++- livecd/runscript/alpha-archscript.sh | 6 +++--- livecd/runscript/hppa-archscript.sh | 4 ++-- livecd/runscript/sparc-archscript.sh | 4 ++-- livecd/runscript/sparc64-archscript.sh | 4 ++-- livecd/runscript/x86-archscript.sh | 14 +++++++++++--- 6 files changed, 29 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3efe643e..25026d8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.120 2004/12/12 16:32:06 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.121 2004/12/12 16:39:11 wolf31o2 Exp $ + + 12 Dec 2004; Chris Gianelloni + livecd/runscript/alpha-archscript.sh, livecd/runscript/hppa-archscript.sh, + livecd/runscript/sparc-archscript.sh, + livecd/runscript/sparc64-archscript.sh, + livecd/runscript/x86-archscript.sh: + Added failures to all arches on mkisofs failure and also made -z option to + mkisofs optional on x86 depending on loop type used. 12 Dec 2004; Chris Gianelloni livecd/runscript/x86-archscript.sh: diff --git a/livecd/runscript/alpha-archscript.sh b/livecd/runscript/alpha-archscript.sh index adb1e5cf..8b526caa 100755 --- a/livecd/runscript/alpha-archscript.sh +++ b/livecd/runscript/alpha-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/alpha-archscript.sh,v 1.5 2004/10/15 02:40:00 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/alpha-archscript.sh,v 1.6 2004/12/12 16:39:11 wolf31o2 Exp $ case $1 in kernel) @@ -62,10 +62,10 @@ case $1 in # command to build the iso file case ${clst_livecd_cdfstype} in zisofs) - mkisofs -J -R -l -z -o ${2} ${clst_cdroot_path} + mkisofs -J -R -l -z -o ${2} ${clst_cdroot_path} || die "Cannot make ISO image" ;; *) - mkisofs -J -R -l -o ${2} ${clst_cdroot_path} + mkisofs -J -R -l -o ${2} ${clst_cdroot_path} || die "Cannot make ISO image" ;; esac isomarkboot ${2} /boot/bootlx diff --git a/livecd/runscript/hppa-archscript.sh b/livecd/runscript/hppa-archscript.sh index f2dc6a0a..aab0de40 100644 --- a/livecd/runscript/hppa-archscript.sh +++ b/livecd/runscript/hppa-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/hppa-archscript.sh,v 1.5 2004/10/15 02:40:00 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/hppa-archscript.sh,v 1.6 2004/12/12 16:39:11 wolf31o2 Exp $ case $1 in kernel) @@ -74,7 +74,7 @@ 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} ${clst_cdroot_path} + mkisofs -J -R -l -o ${2} ${clst_cdroot_path} || die "Cannot make ISO image" palo -f boot/palo.conf -C ${2} ;; esac diff --git a/livecd/runscript/sparc-archscript.sh b/livecd/runscript/sparc-archscript.sh index 80e531f7..3e09b930 100644 --- a/livecd/runscript/sparc-archscript.sh +++ b/livecd/runscript/sparc-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/sparc-archscript.sh,v 1.6 2004/10/21 17:06:21 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc-archscript.sh,v 1.7 2004/12/12 16:39:11 wolf31o2 Exp $ case $1 in kernel) @@ -73,6 +73,6 @@ case $1 in iso) # this is for the livecd-final target, and calls the proper # command to build the iso file - mkisofs -J -R -l -o ${2} -G ${clst_cdroot_path}/boot/isofs.b -B ... ${clst_cdroot_path} + mkisofs -J -R -l -o ${2} -G ${clst_cdroot_path}/boot/isofs.b -B ... ${clst_cdroot_path} || die "Cannot make ISO image" ;; esac diff --git a/livecd/runscript/sparc64-archscript.sh b/livecd/runscript/sparc64-archscript.sh index adbb5486..c3b8c852 100644 --- a/livecd/runscript/sparc64-archscript.sh +++ b/livecd/runscript/sparc64-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/sparc64-archscript.sh,v 1.8 2004/10/29 21:14:59 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc64-archscript.sh,v 1.9 2004/12/12 16:39:11 wolf31o2 Exp $ case $1 in kernel) @@ -76,7 +76,7 @@ case $1 in # Seems silo 1.3.x+ breaks on newer machines # when booting from CD (current as of silo 1.4.8) mv ${clst_cdroot_path}/boot/mkisofs.sparc.fu /tmp - /tmp/mkisofs.sparc.fu -o ${2} -D -r -pad -quiet -S 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf' -abstract 'Gentoo Linux Sparc' -copyright 'Gentoo Foundation' -P 'Gentoo Linux Sparc' -p 'Gentoo Linux Sparc' -V 'Gentoo Linux Sparc 2004.3' -A 'Gentoo Linux Sparc' ${clst_cdroot_path} + /tmp/mkisofs.sparc.fu -o ${2} -D -r -pad -quiet -S 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf' -abstract 'Gentoo Linux Sparc' -copyright 'Gentoo Foundation' -P 'Gentoo Linux Sparc' -p 'Gentoo Linux Sparc' -V 'Gentoo Linux Sparc 2004.3' -A 'Gentoo Linux Sparc' ${clst_cdroot_path} || die "Cannot make ISO image" rm /tmp/mkisofs.sparc.fu ;; esac diff --git a/livecd/runscript/x86-archscript.sh b/livecd/runscript/x86-archscript.sh index 41f927b7..8af785f2 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.17 2004/12/12 16:32:06 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.18 2004/12/12 16:39:11 wolf31o2 Exp $ case $1 in kernel) @@ -106,7 +106,15 @@ 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} || die "Cannot make ISO image" + #this is for the livecd-stage2 target, and calls the proper command + # 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 -boot-load-size 4 -boot-info-table ${clst_cdroot_path} || die "Cannot make ISO image" + ;; + esac ;; esac -- 2.26.2