Stop copying the /tools/ directory on from the mirror; it's going away

This commit is contained in:
Steve McIntyre 2008-11-17 23:34:32 +00:00
parent 262e02ffca
commit f48c4f3d27
4 changed files with 6 additions and 25 deletions

View File

@ -383,17 +383,6 @@ Installing
<A href="http://www.debian.org/releases/etch/installmanual">the Debian web site</a>. <A href="http://www.debian.org/releases/etch/installmanual">the Debian web site</a>.
#endif #endif
<P> <P>
Programs and other files that are needed for the installation can be found on
this disc under
<P>
<tt>&nbsp;
<A href=%%""tools/%%"">/tools/</a>
</tt>
#if ARCHi386
and
<tt>&nbsp;
<A href=%%""install/floppy/%%"">/install/floppy/</a>
</tt>
#endif #endif
#if ARCHi386 || ARCHamd64 || ARCHia64 || ARCHalpha || ARCHpowerpc || ARCHsparc #if ARCHi386 || ARCHamd64 || ARCHia64 || ARCHalpha || ARCHpowerpc || ARCHsparc

View File

@ -240,12 +240,6 @@
updated versions for the Installation Guide are available from updated versions for the Installation Guide are available from
<a href="http://www.debian.org/releases/lenny/installmanual">the Debian web site</a>. <a href="http://www.debian.org/releases/lenny/installmanual">the Debian web site</a>.
</p> </p>
# endif
<p>Programs and other files that are needed for the installation can be
found on this disc under
<tt><a href=%%""tools/%%"">/tools/</a></tt>
# if ARCHi386
and <tt><a href=%%""install/floppy/%%"">/install/floppy/</a></tt>
# endif # endif
</p> </p>

4
debian/changelog vendored
View File

@ -43,6 +43,10 @@ debian-cd (3.1.0) UNRELEASED; urgency=low
isolinux config gets modified correctly independent of the order in which isolinux config gets modified correctly independent of the order in which
the arches are specified. the arches are specified.
[ Steve McIntyre ]
* Stop copying the /tools/ directory on from the mirror; it's going
away.
-- Frans Pop <fjp@debian.org> Thu, 13 Nov 2008 22:17:21 +0100 -- Frans Pop <fjp@debian.org> Thu, 13 Nov 2008 22:17:21 +0100
debian-cd (3.0.5) unstable; urgency=low debian-cd (3.0.5) unstable; urgency=low

View File

@ -110,19 +110,13 @@ fi
if [ $DISKNUM = 1 ] ; then if [ $DISKNUM = 1 ] ; then
if [ "$OMIT_DOC_TOOLS" != "1" ]; then if [ "$OMIT_DOC_TOOLS" != "1" ]; then
if [ ! -e $MIRROR/tools ] || [ ! -e $MIRROR/doc ]; then if [ ! -e $MIRROR/doc ]; then
echo "You need a Debian mirror with the doc, tools and" echo "You need a Debian mirror with the doc and"
echo "indices directories ! " echo "indices directories ! "
exit 1 exit 1
fi fi
fi fi
# Add install stuff
if [ "$SOURCEONLY"x != "yes"x ] && [ "$OMIT_DOC_TOOLS" != "1" ]; then
echo " Adding tools to CD1"
$BASEDIR/tools/add_files $CDDIR $MIRROR tools
fi
echo " Adding .disk/base_components" echo " Adding .disk/base_components"
echo "main" > $CDDIR/.disk/base_components echo "main" > $CDDIR/.disk/base_components
if [ -n "$LOCAL" ] ; then if [ -n "$LOCAL" ] ; then