debian/CONF.sh: added defaults for new vars

tools/boot/potato/boot-sparc: updates for sparc CD's

debian/CONF.sh

@@ -1,9 +1,5 @@
-# Debian CD configuration file
-# This file will have to be sourced where needed
-#
-
 # The YACS dir
-export BASEDIR=/usr/share/debian-cd
+export BASEDIR=`pwd`
 
 # Building potato cd set ...
 export CODENAME=potato
@@ -11,19 +7,26 @@ export CODENAME=potato
 # ... for arch  
 export ARCH=`dpkg --print-installation-architecture`
 
-# IMPORTANT : The 3 following paths must be on the same partition/device
-#             or you won't be able to use debian-cd in the standard way.
-#             If really you can't then, you can try with the symlink farm,
-#             read the README for more information about this.
+# IMPORTANT : The 4 following paths must be on the same partition/device.
+#	      If they aren't then you must set COPYLINK below to 1. This
+#	      takes a lot of extra room to create the sandbox for the ISO
+#	      images, however. Also, if you are using an NFS partition for
+#	      some part of this, you must use this option.
 # Paths to the mirrors
 export MIRROR=/home/ftp/debian
+
 # Comment the following line if you don't have/want non-US
-# export NONUS=/home/ftp/debian-non-US
+#export NONUS=/ftp/debian-non-US
+
 # Path of the temporary directory
 export TDIR=/home/ftp/tmp
 
 # Path where the images will be written
-export OUT=/home/ftp/debian-cd
+export OUT=/home
+
+# Where we keep the temporary apt stuff.
+# This cannot reside on an NFS mount.
+export APTTMP=/home/ftp/tmp/apt
 
 # Do I want to have NONFREE
 # export NONFREE=1
@@ -34,11 +37,16 @@ export OUT=/home/ftp/debian-cd
 # export LOCAL=1
 
 # Sparc only : bootdir (location of cd.b and second.b)
-#export BOOTDIR=
+# export BOOTDIR=/boot
 
 # Symlink farmers should uncomment this line :
 # export SYMLINK=1
 
+# Use this to force copying the files instead of symlinking or hardlinking
+# them. This is useful if your destination directories are on a different
+# partition than your source files.
+# export COPYLINK=1
+
 # Options
 # export MKISOFS=/usr/bin/mkhybrid
 # export MKISOFS_OPTS="-a -r -T"	#For normal users

tools/boot/potato/boot-sparc

@@ -35,7 +35,8 @@ mkdir -p $inst/{boot/sun4{u,cdm},etc}
 cp -p $BOOTDIR/{cd,second}.b $inst/boot/
 
 # Some custom etc files
-cp -p $BASEDIR/tools/boot/potato/sparc-etc/* $inst/etc/
+cp -p $BASEDIR/tools/boot/potato/sparc-etc/{boot-msg.txt,debian.txt,silo.conf} \
+	$inst/etc/
 
 # linux kernel & co are fetched directly from the rescue disks
 tmp=/var/tmp/debian_cd
@@ -61,13 +62,20 @@ cp -a $tmp/debian-sparc-root/* $inst/.
 # no longer need this
 rm -rf $tmp
 
-# make this as a cdrom root. this gives dbootstrap a heads up
+# make this a cdrom root, this gives dbootstrap a heads up
 echo $CODENAME > $inst/cdrom_image
 
 # Get rid of some junk
-rm -f $inst/{boot_message,release_notes,type.txt}
+rm -f $inst/{boot_message,type.txt}
 
 # Make writable areas point to /tmp
 rmdir $inst/var/{log,run}
-ln -s ../tmp $inst/var/log
-ln -s ../tmp $inst/var/run
+ln -s ../tmp/log $inst/var/log
+ln -s ../tmp/run $inst/var/run
+
+# Hack...need a better way
+ln -s ../tmp/resolv.conf $inst/etc/resolv.conf
+ln -s ../target/etc/modules.conf $inst/etc/modules.conf
+ln -s ../../target/usr/bin/whiptail $inst/usr/bin/whiptail
+rmdir $inst/lib/modules
+ln -s ../target/lib/modules $inst/lib/modules