* Documentation updates.

* Changed how the sizelimit is get by the scripts (they could have ignored
  values given by the environment variable).
* Put the documentation tree from the mirror on the first CD only.

Makefile

@@ -329,9 +329,9 @@ $(BDIR)/bootable-stamp:
 doc: ok bin-infos $(BDIR)/1/doc
 $(BDIR)/1/doc:
 	@echo "Adding the documentation ..."
+	@$(addfiles) $(BDIR)/1 $(MIRROR) doc; 
 	@for i in $(BDIR)/*.packages; do \
 		dir=$${i%%.packages}; \
-		$(addfiles) $$dir $(MIRROR) doc; \
 		cp -d $(MIRROR)/README* $$dir/; \
 		if [ -e $(MIRROR)/dists/$(CODENAME)/main/Release-Notes ]; then \
 		   cp $(MIRROR)/dists/$(CODENAME)/main/Release-Notes $$dir/; \
@@ -357,8 +357,6 @@ $(BDIR)/1/doc:
 		   cp $(BASEDIR)/data/$(CODENAME)/README.multicd $$dir/; \
 		fi; \
 	done
-	
-	
 
 # Add the install stuff on the first CD
 installtools: ok doc disks $(BDIR)/1/tools

README

@@ -42,7 +42,7 @@ Edit the CONF.sh and change the PATHs for the mirror and so on.
 $ vim CONF.sh
 $ . CONF.sh
 $ make status
-$ make list COMPLETE=1 SIZELIMIT1=576716800
+$ make list COMPLETE=1 SIZELIMIT1=555000000 SRCSIZELIMIT=665000000
 $ make official_images
 [ or if you want only binary images :
   $ make bin-official_images ]

README.devel

@@ -53,6 +53,7 @@ Log files :
 
 TODO list :
 -----------
++ put the doc directory only on the first binary CD
 + be able to use an alternate location for the boot disks
   (in order to use i18ned boot disks and to more easily
    test debian-cd with CVS version of the boot-floppies)

tools/boot/woody/boot-i386

@@ -6,6 +6,7 @@
 #
 # Heavily hacked by Raphaël Hertzog <hertzog@debian.org> for
 # YACS (the new debian-cd in potato)
+# 12MAR00  updated for current i386 bootdisks  --jwest
 #
 # Do install stuff for i386, including making bootable CDs
 #
@@ -23,10 +24,10 @@ cd $CDDIR/..
 # Compact image for disk 2
 if [ $N == 2 ]; then
 	:> 2.mkisofs_opts
-	if [ -e 1/dists/$CODENAME/main/disks-$ARCH/current/disks-2.88/compact/rescue.bin ] 
+	if [ -e 1/dists/$CODENAME/main/disks-$ARCH/current/images-2.88/compact/rescue.bin ] 
 	then
 	  mkdir -p boot2/boot
-	  cp 1/dists/$CODENAME/main/disks-$ARCH/current/disks-2.88/compact/rescue.bin boot2/boot/
+	  cp 1/dists/$CODENAME/main/disks-$ARCH/current/images-2.88/compact/rescue.bin boot2/boot/
 	  echo -n "-J -b boot/rescue.bin -c boot/boot.catalog boot2" \
 		        > 2.mkisofs_opts
 	fi
@@ -45,47 +46,27 @@ fi
 echo -n "-J -b boot/rescue.bin -c boot/boot.catalog boot1" > 1.mkisofs_opts
 
 (cd $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/ ; \
-	cp disks-2.88/resc*.bin  $CDDIR/install ; \
+	cp images-1.44/resc*.bin  $CDDIR/install ; \
 	cp linux  $CDDIR/install ; \
-	cp disks-1.44/root.bin $CDDIR/install )
+	cp images-1.44/root.bin $CDDIR/install )
 
 mkdir -p boot1/boot
 
-cp $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/disks-2.88/rescue.bin boot1/boot
+cp $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/images-2.88/rescue.bin boot1/boot
 
 
 #Extracting tools for disc 1
 
-mkdir -p $CDDIR/tools/fips20
+mkdir -p $CDDIR/install/dosutils
-(cd $CDDIR/tools/fips20; \
-	unzip -Lq $MIRROR/tools/fips20.zip >/dev/null; \
-	rm restorrb source -rf)
 
-(cd $CDDIR/tools; \
+cp $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/dosutils/* $CDDIR/install/dosutils/
-	unzip -Lq $MIRROR/tools/lodlin16.zip >/dev/null; \
-	rm lodlin16/src lodlin16/initrd loadlin16/debian -rf )
 
-mkdir $CDDIR/tools/rawrite1
-(cd $CDDIR/tools/rawrite1; \
-	unzip -Lq $MIRROR/tools/rawrite1.zip >/dev/null)
-
-mkdir $CDDIR/tools/rawrite2
-(cd $CDDIR/tools/rawrite2; \
-	unzip -Lq $MIRROR/tools/rawrite2.zip >/dev/null; \
-	rm rawrite2.c )
 
 (echo "Tools for DOS :" ; \
-	echo "fips20/         non-destructively shorten a FAT partition" ; \
+	echo "lodlin/         load Linux kernel from DOS" ;\
-	echo "lodlin16/       load Linux kernel from DOS" ;\
-	echo "rawrite1/       rawrite 1.3 : create disks from disk images (*.bin)"; \
 	echo "rawrite2/       rawrite 2.0 : create disks from disk images (*.bin)"; \
-	echo "         rawrite 2.0 is much faster, but it locks up on some machines";\
 	) |todos > $CDDIR/tools/README.tools
 
-cp $CDDIR/tools/lodlin16/*.exe $CDDIR/install
-cp $CDDIR/tools/rawrite1/rawrite3.com $CDDIR/install/rw1_3.com
-cp $CDDIR/tools/rawrite2/rawrite2.exe $CDDIR/install/rw2_0.exe
-cp $CDDIR/tools/fips*/*.exe $CDDIR/install
 
 (echo "@ echo off" ; \
 	echo "rem Flush any write-cached disk blocks before we leave DOS. " ; \

tools/cds2src

@@ -11,7 +11,7 @@
 
 use strict;
 
-my $deflimit = shift || $ENV{'SRCSIZELIMIT'} || $ENV{'SIZELIMIT'} || 629145600;
+my $deflimit = $ENV{'SRCSIZELIMIT'} || $ENV{'SIZELIMIT'} || shift || 629145600;
 my $limit = $ENV{'SRCSIZELIMIT1'} || $deflimit;
 
 my $nonfree = $ENV{'NONFREE'};

tools/list2cds

@@ -11,7 +11,7 @@
 use strict;
 
 my $list = shift;
-my $deflimit = shift || $ENV{'SIZELIMIT'} || 639631360;
+my $deflimit = $ENV{'SIZELIMIT'} || shift || 639631360;
 my $limit = $ENV{'SIZELIMIT1'} || $deflimit;
 
 my $nonfree = $ENV{'NONFREE'} || 0;