Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make make_disc_trees.pl and start_new_disc fail better on errors

This commit is contained in:
Steve McIntyre 2006-12-23 03:03:58 +00:00
parent 528c0072f2
commit eb1131b3df
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -196,6 +196,7 @@ debian-cd (3.0.0) UNRELEASED; urgency=low
* Other cleanups:
+ Make build_all.sh work again, adapting build.sh
+ Promote Suggests: on netpbm, syslinux to Recommends:
+ Make make_disc_trees.pl and start_new_disc fail better on errors
-- Frans Pop <fjp@debian.org> Mon, 18 Dec 2006 16:20:22 +0100

6
tools/make_disc_trees.pl
View File

@ -337,8 +337,12 @@ sub get_disc_size {
}
sub start_disc {
my $error = 0;
system("start_new_disc $basedir $mirror $tdir $codename \"$archlist\" $disknum");
$error = system("start_new_disc $basedir $mirror $tdir $codename \"$archlist\" $disknum");
if ($error != 0) {
die " Failed to start disc $disknum, error $error\n";
}
get_disc_size();

8
tools/start_new_disc
View File

@ -343,11 +343,15 @@ do
$BASEDIR/tools/$CODENAME/upgrade-$ARCH.sh $DISKNUM $CDDIR
fi
echo " (Optionally) making the image bootable for $ARCH"
echo " (Optionally) making the image bootable for $ARCH:"
if [ -f $BASEDIR/tools/boot/$DI_CODENAME/boot-$ARCH ] ; then
cd $TDIR
echo " Running tools/boot/$DI_CODENAME/boot-$ARCH $DISKNUM $CDDIR"
$BASEDIR/tools/boot/$DI_CODENAME/boot-$ARCH $DISKNUM $CDDIR
$BASEDIR/tools/boot/$DI_CODENAME/boot-$ARCH $DISKNUM $CDDIR || booterror=$?
if [ "$booterror"x != ""x ] ; then
echo " FAILED: error $booterror"
exit $booterror
fi
else
if [ "${IGNORE_MISSING_BOOT_SCRIPT:-0}" = "0" ] ; then
echo " No script to make CDs bootable for $ARCH"