From 97739af22425b810b94fa492ce119e972dfb9291 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 18 Sep 2006 12:29:57 +0000 Subject: [PATCH] * Applied patches that are being in use at O.S. Systems and that are useful to others: - allow to use different name for final iso image; - allow to set the script to be used in debootstrap to check if all base need package are present; --- debian/changelog | 9 ++++++++- tools/add_debs | 2 +- tools/make_image | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 51a34bc0..d6542932 100644 --- a/debian/changelog +++ b/debian/changelog @@ -145,7 +145,14 @@ debian-cd (2.2.25) UNRELEASED; urgency=low yaboot.conf and pegasos boot script. * Remove init=/linuxrc from hppa. - -- Sven Luther Wed, 6 Sep 2006 21:38:33 +0200 + [ Otavio Salvador ] + * Applied patches that are being in use at O.S. Systems and that are + useful to others: + - allow to use different name for final iso image; + - allow to set the script to be used in debootstrap to check if all + base need package are present; + + -- Otavio Salvador Fri, 15 Sep 2006 14:56:28 -0300 debian-cd (2.2.24) unstable; urgency=low diff --git a/tools/add_debs b/tools/add_debs index 1ac92ca7..6a29cc22 100755 --- a/tools/add_debs +++ b/tools/add_debs @@ -40,7 +40,7 @@ for DISK in $FIRSTDISKS do DISK=${DISK##CD} ok=yes - for p in `debootstrap --arch $ARCH --print-debs $CODENAME $TDIR/debootstrap.tmp file:$MIRROR` + for p in `debootstrap --arch $ARCH --print-debs $CODENAME $TDIR/debootstrap.tmp file:$MIRROR $DEBOOTSTRAP_SCRIPT` do if ! grep -q ^$p$ $BDIR/$DISK.packages ; then if [ -n "$BASE_EXCLUDE" ] && grep -q ^$p$ $BASE_EXCLUDE ; then diff --git a/tools/make_image b/tools/make_image index 34eece6f..4b93eeb7 100755 --- a/tools/make_image +++ b/tools/make_image @@ -41,9 +41,9 @@ do DISKINFO=`cat $DIR/$n.diskinfo` if [ $ARCH = "source" ] ; then - OUTFILE="debian-$relname-$ARCH-$n" + OUTFILE="${CDNAME:-debian}-$relname-$ARCH-$n" else - OUTFILE="debian-$relname-$ARCH-binary-$n" + OUTFILE="${CDNAME:-debian}-$relname-$ARCH-binary-$n" fi # Clean up any old files