* Fix handling of NONFREE/EXTRANONFREE variable.

* Update the order of the boot images for i386 :
  1: isolinux multiboot
  2: vanilla
  3: compact
  4: idepci
  5: bf2.4
* Put ISOLINUX=1 by default. Added it to CONF.sh.

CONF.sh

@@ -15,6 +15,7 @@ unset SYMLINK
 unset COPYLINK
 unset MKISOFS
 unset MKISOFS_OPTS
+unset ISOLINUX
 unset EXCLUDE
 unset SRCEXCLUDE
 unset NORECOMMENDS
@@ -110,6 +111,9 @@ export APTTMP=/ftp/tmp/apt
 # export MKISOFS_OPTS="-r -T"		#For normal users
 # export MKISOFS_OPTS="-r -F . -T"	#For symlink farmers
 
+# ISOLinux support for multiboot on CD1 for i386
+export ISOLINUX=1
+
 # uncomment this to if you want to see more of what the Makefile is doing
 #export VERBOSE_MAKE=1
 

debian/CONF.sh

@@ -11,6 +11,7 @@ unset SYMLINK
 unset COPYLINK
 unset MKISOFS
 unset MKISOFS_OPTS
+unset ISOLINUX
 unset EXCLUDE
 unset SRCEXCLUDE
 unset NORECOMMENDS
@@ -103,6 +104,9 @@ export APTTMP=/home/ftp/tmp/apt
 # export MKISOFS_OPTS="-r -T"		#For normal users
 # export MKISOFS_OPTS="-r -F . -T"	#For symlink farmers
 
+# ISOLinux support for multiboot on CD1 for i386
+export ISOLINUX=1
+
 # uncomment this to if you want to see more of what the Makefile is doing
 #export VERBOSE_MAKE=1
 

debian/changelog

@@ -27,8 +27,19 @@ debian-cd (2.2.14) unstable; urgency=low
     images, rather than loading the rescue disks directly from the boot
     sector.
   * Removed obsolete local-variables section from changelog.
+  * Added default values into CONF.sh for isolinux support.
+  * Change again the order of the boot images for i386.
+    1: multiboot (isolinux) 2: vanilla 3: compact 4: idepci 5: bf2.4
+  * Put TERM=vt102 for vanilla flavor as it seems to fix the borders
+    of the boxes in a few cases.
+  * Improved the test to see if we want non-free. Instead of -n "$NONFREE"
+    it's now "${NONFREE:-0}" != "0" (same for EXTRANONFREE). Maybe
+    should we do the same for the other boolean environment variables like
+    LOCAL, SECURITY, SECURED ...
+  * Changed the test for ISOLINUX and MULTIBOOT to be coherent with the other
+    boolean variables.
 
- -- Raphael Hertzog <hertzog@debian.org>  Mon,  8 Apr 2002 20:37:41 -0500
+ -- Raphael Hertzog <hertzog@debian.org>  Fri, 12 Apr 2002 17:34:31 +0200
 
 debian-cd (2.2.13) unstable; urgency=low
 

tools/add_dirs

@@ -9,7 +9,7 @@ SECTIONS="admin base comm devel doc editors electronics games graphics \
 set -e
 
 # There's no difference between NONFREE and EXTRANONFREE for this script
-if [ -n "$EXTRANONFREE" ]
+if [ "${EXTRANONFREE:-0}" != "0" ]
 then
 	NONFREE=1
 fi
@@ -46,7 +46,7 @@ do
         mkdir -p dists/$CODENAME/contrib/binary-$ARCH/$i
         mkdir -p dists/$CODENAME/contrib/binary-all/$i
         mkdir -p dists/$CODENAME/contrib/source/$i
-        if [ -n "$NONFREE" ]; then
+        if [ "${NONFREE:-0}" != "0" ]; then
                 mkdir -p dists/$CODENAME/non-free/binary-$ARCH/$i
                 mkdir -p dists/$CODENAME/non-free/binary-all/$i
                 mkdir -p dists/$CODENAME/non-free/source/$i
@@ -65,7 +65,7 @@ if [ -n "$SECURITY" ]; then
     mkdir -p dists/$CODENAME/updates/contrib/binary-$ARCH
     mkdir -p dists/$CODENAME/updates/contrib/binary-all
     mkdir -p dists/$CODENAME/updates/contrib/source
-    if [ -n "$NONFREE" ]; then
+    if [ "${NONFREE:-0}" != "0" ]; then
         mkdir -p dists/$CODENAME/updates/non-free/binary-$ARCH
         mkdir -p dists/$CODENAME/updates/non-free/binary-all
         mkdir -p dists/$CODENAME/updates/non-free/source
@@ -79,7 +79,7 @@ if [ -n "$NONUS" ]; then
         mkdir -p dists/$CODENAME/non-US/contrib/binary-$ARCH
         mkdir -p dists/$CODENAME/non-US/contrib/binary-all
         mkdir -p dists/$CODENAME/non-US/contrib/source
-        if [ -n "$NONFREE" ]; then
+        if [ "${NONFREE:-0}" != "0" ]; then
                 mkdir -p dists/$CODENAME/non-US/non-free/binary-$ARCH
                 mkdir -p dists/$CODENAME/non-US/non-free/binary-all
                 mkdir -p dists/$CODENAME/non-US/non-free/source

tools/apt-selection

@@ -28,7 +28,7 @@ options=" -q -o Dir::State::status=$APTTMP/$CODENAME-$ARCH/status \
 	  -o APT::Cache::AllVersions=0 \
 	  -o APT::Architecture=$ARCH "
 
-if [ -n "$NONFREE" -o -n "$EXTRANONFREE" ]; then
+if [ "${NONFREE:-0}" != "0" -o "${EXTRANONFREE:-0}" != "0" ]; then
 	sections="main contrib non-free"
 else
 	sections="main contrib"

tools/boot/woody/boot-i386

@@ -38,11 +38,11 @@ NN=`echo $N | sed -e 's/_NONUS//'`
 # what kernel-type to put on what disk?
 # a null "" value will use the default boot-disk kernel
 #
-KTYPE[1]="idepci"
+KTYPE[1]="bf2.4" #multiboot in fact
-KTYPE[2]="compact"
+KTYPE[2]="" #vanilla
-KTYPE[3]="bf2.4"
+KTYPE[3]="compact"
-KTYPE[4]=""
+KTYPE[4]="idepci"
-KTYPE[5]=""
+KTYPE[5]="bf2.4"
 KTYPE[6]=""
 KTYPE[7]=""
 KTYPE[8]=""
@@ -55,7 +55,7 @@ THISTYPE=${KTYPE[$NN]}
 #
 :> $N.mkisofs_opts
 
-if [ "$ISOLINUX" = "yes" ] && [ "$NN" = "1" ]; then
+if [ "${ISOLINUX:-0}" != "0" ] && [ "$NN" = "1" ]; then
     echo "Using ISOLINUX boot-disks image on CD$N"
     mkdir -p boot$N/isolinux
     cp -f /usr/lib/syslinux/isolinux.bin boot$N/isolinux/
@@ -80,13 +80,13 @@ if [ "$N" = "1" ] || [ "$N" = "1_NONUS" ] ; then
 
 
 # # new new new # #
-# The next chunk of code is only used if MULTIBOOT=yes
+# The next chunk of code is only used if MULTIBOOT=1
 # Make disk1 a multi-boot image
 # ElTorito supports multiple boot images
 # Setup all boot-disk images (currently 4)
 
 
-if [ "$MULTIBOOT" = "yes" ] && [ ! "$ISOLINUX" = "yes" ]; then
+if [ "${MULTIBOOT:-0}" != "0" ] && [ "${ISOLINUX:-0}" = "0" ]; then
         echo "Adding additional boot images to CD1"
 
     for i in 2 3 4 ; do
@@ -120,7 +120,7 @@ fi
 # Tools for disc 1
 # and include the legacy DOS stuff 
 
-if [ "$ISOLINUX" = "yes" ]; then
+if [ "${ISOLINUX:-0}" != "0" ]; then
     cp -f $BASEDIR/data/woody/isolinux.txt $BASEDIR/data/woody/f*.txt boot$N/isolinux/
     cat > boot$N/isolinux/isolinux.cfg <<EOF
 DEFAULT /install/linpci
@@ -134,7 +134,7 @@ LABEL compact
   append root=/dev/ram ro initrd=compact.bin ramdisk_size=16384 disksize=1.44 flavor=compact
 LABEL vanilla
   kernel /install/linux
-  append root=/dev/ram ro initrd=root.bin ramdisk_size=16384 disksize=1.44
+  append root=/dev/ram ro initrd=root.bin ramdisk_size=16384 disksize=1.44 TERM=vt102
 LABEL bf24
   kernel /install/lin24
   append root=/dev/ram ro initrd=bf24.bin ramdisk_size=16384 disksize=1.44 flavor=bf2.4
@@ -209,7 +209,7 @@ loadlin.exe lin24 root=/dev/ram ro initrd=bf24.bin ramdisk_size=16384 disksize=1
 
 :FOUR
 echo using standard (vanilla) kernel
-loadlin.exe linux root=/dev/ram ro initrd=root.bin ramdisk_size=16384 disksize=1.44
+loadlin.exe linux root=/dev/ram ro initrd=root.bin ramdisk_size=16384 disksize=1.44 TERM=vt102
 
 EOF
 ) |todos > $CDDIR/install/boot.bat
@@ -219,7 +219,7 @@ fi
 
 
 # write final lines to mkisofs_opts
-if [ "$ISOLINUX" = "yes" ] && [ "$NN" = "1" ]; then
+if [ "${ISOLINUX:-0}" != "0" ] && [ "$NN" = "1" ]; then
     echo -n "boot$N " >> $N.mkisofs_opts
 else
     echo -n "-c boot/boot.catalog boot$N "  >> $N.mkisofs_opts

tools/scanpackages

@@ -13,7 +13,7 @@ BDIR=$TDIR/$CODENAME-$ARCH
 
 PREFIX=`echo $2 | sed "s?$BDIR/CD?$BDIR/?"`
 
-if [ -n "$NONFREE" -o -n "$EXTRANONFREE" ]; then
+if [ "${NONFREE:-0}" != "0" -o "${EXTRANONFREE:-0}" != "0" ]; then
   SECTIONS="main contrib non-free"
   SECTIONSNONUS="non-US/main non-US/contrib non-US/non-free"
 else

tools/scansources

@@ -11,7 +11,7 @@ set -e
 SDIR=$TDIR/$CODENAME-src
 PREFIX=`echo $1 | sed "s?$SDIR/CD?$SDIR/?"`
 
-if [ -n "$NONFREE" -o -n "$EXTRANONFREE" ]; then
+if [ "${NONFREE:-0}" != "0" -o "${EXTRANONFREE:-0}" != "0" ]; then
   SECTIONS="main contrib non-free"
 else
   SECTIONS="main contrib"