Don't check source-only discs for installability of base
This commit is contained in:
parent
d3aa586a36
commit
44b17db956
|
@ -101,26 +101,26 @@ finish_disc () {
|
||||||
CDDIR=$1
|
CDDIR=$1
|
||||||
NOT=$2
|
NOT=$2
|
||||||
|
|
||||||
if [ $DISKNUM = 1 ] ; then
|
if [ $DISKNUM = 1 ] && [ "$ARCHES"x != "source"x ] ; then
|
||||||
for ARCH in $ARCHES_NOSRC
|
for ARCH in $ARCHES_NOSRC
|
||||||
do
|
do
|
||||||
echo " Checking base is installable for $ARCH"
|
echo " Checking base is installable for $ARCH"
|
||||||
ARCHOK=`check_base_installable $ARCH $CDDIR`
|
ARCHOK=`check_base_installable $ARCH $CDDIR`
|
||||||
if [ $ARCHOK -gt 0 ] ; then
|
if [ $ARCHOK -gt 0 ] ; then
|
||||||
echo " $ARCH is missing $ARCHOK files needed for debootstrap, look in $LOG for the list"
|
echo " $ARCH is missing $ARCHOK files needed for debootstrap, look in $LOG for the list"
|
||||||
fi
|
|
||||||
ok=$(($ok + $ARCHOK))
|
|
||||||
done
|
|
||||||
if [ $ok = 0 ] ; then
|
|
||||||
touch $CDDIR/.disk/base_installable
|
|
||||||
echo " all files needed for debootstrap"
|
|
||||||
else
|
|
||||||
echo " $ok files missing for debootstrap, not creating base_installable"
|
|
||||||
if [ "$DISKTYPE"x = "BC"x ] ; then
|
|
||||||
echo " This is expected - building a BC"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
echo "$ok files missing for debootstrap" >> $LOG
|
ok=$(($ok + $ARCHOK))
|
||||||
|
done
|
||||||
|
if [ $ok = 0 ] ; then
|
||||||
|
touch $CDDIR/.disk/base_installable
|
||||||
|
echo " all files needed for debootstrap"
|
||||||
|
else
|
||||||
|
echo " $ok files missing for debootstrap, not creating base_installable"
|
||||||
|
if [ "$DISKTYPE"x = "BC"x ] ; then
|
||||||
|
echo " This is expected - building a BC"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
echo "$ok files missing for debootstrap" >> $LOG
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo " Finishing off md5sum.txt"
|
echo " Finishing off md5sum.txt"
|
||||||
|
|
Loading…
Reference in New Issue