--- toast-linux	2004/04/12 23:24:43	1.13
+++ toast-linux	2004/04/13 19:55:57	1.14
@@ -56,10 +56,12 @@
   s/!PREFIX!/$prefix/g;
 }
 
-for($text{"skel/floppy/logo"})
-{
-  s!^(( {8})+)!"\t" x (length($1)/8)!mge;
-}
+# looks like SYSLINUX doesn't support tabs....
+# TODO: banish non-printing characters from configure script
+#for($text{"skel/floppy/logo"})
+#{
+#  s!^(( {8})+)!"\t" x (length($1)/8)!mge;
+#}
 
 my($oldcfg);
 for($text{"skel/floppy/syslinux.cfg"})
@@ -121,8 +123,11 @@
 
 WGET = wget
 
-PKGS = LINUX TOOLCHAIN BUSYBOX E2FSPROGS NTFSPROGS PARTED DEVMAP LVM2
+FROMCONF = dev toast-linux.stub mkhd bochs-config
+FROMCONF2 = smartcat linux-config busybox-config
 
+PKGS = TOOLCHAIN LINUX BUSYBOX E2FSPROGS NTFSPROGS PARTED DEVMAP LVM2 GENEXT2FS MTOOLS SYSLINUX CDRTOOLS
+
 # TOOLCHAIN_VERSION = ??? [only available from cvsweb right now...]
 LINUX_VERSION = 2.6.5
 BUSYBOX_VERSION = 1.00-pre8
@@ -237,11 +242,14 @@
 $(CDRTOOLS_ARCHIVE): ; $(WGET) $(CDRTOOLS_URL)
 
 clean:
-  rm -fr $(PKG_DIRS) symbols floppy* root*
+  rm -fr $(PKG_DIRS) symbols floppy* cd* root* toast-linux* $(FROMCONF) $(FROMCONF2) skel
 
 cleaner: clean
   rm -f *.tar.gz *.tar.bz2 *.diff.gz
 
+distclean: cleaner
+  rm -f Makefile
+
 .DELETE_ON_ERROR:
 
 $(LINUX_DIR)/.config: $(LINUX_ARCHIVE) linux-config smartcat
@@ -316,11 +324,11 @@
 symbols: $(BUSYBOX) $(E2FSCK) $(TUNE2FS) $(NTFSRESIZE) $(PARTED) $(DEVMAP) $(LVM2)
   $(TOOLCHAIN_BIN_DIR)/nm -Dp $^ | perl -lne '/.{8} [BUV] (.+)/ && print "-u $$1"' | sort -u > $@ 
 
-Makefile dev toast-linux.stub mkhd bochs-config: !CONFIGURE!
+Makefile $(FROMCONF): !CONFIGURE!
   !CONFIGURE! $@
 
 # these depend on configure, but we pretend they don't to speed things up:
-smartcat linux-config busybox-config:
+$(FROMCONF2):
   !CONFIGURE! $@
 
 skel: !CONFIGURE!
@@ -401,11 +409,11 @@
 toast-linux.1: toast-linux.stub
   pod2man $< > $@
 
-run: floppy.img bochs-config
+run: floppy.img bochs-config mkhd
   ./mkhd hda.img $(HDA_CYLINDERS)
   HDA_CYLINDERS=$(HDA_CYLINDERS) bochs -qf bochs-config
 
-run-cd: cd.iso bochs-config-cd
+run-cd: cd.iso bochs-config-cd mkhd
   ./mkhd hda.img $(HDA_CYLINDERS)
   HDA_CYLINDERS=$(HDA_CYLINDERS) bochs -qf bochs-config-cd
 
@@ -1164,7 +1172,7 @@
 # get/validate list of disks
 if [ -n "$DISKS" ]; then
   for disk in $DISKS; do
-    valid_disk_name "$disk" || error "bad disk name: $name"
+    valid_disk_name "$disk" || error "bad disk name: $disk"
   done
 else
   while read major minor blocks name rest; do
@@ -1719,6 +1727,8 @@
 
 toast disarm scripts
 
+lilo
+
 # TODO:
 # openssh
 # reorder and/or rebuild packages to take full advantage of optional libraries
@@ -1729,7 +1739,7 @@
 echo "This script destroys both the hard disk partition table and the floppy."
 echo "Press any key to abort."
 timeout 10
-wget -O /dev/fd0 http://toastball.net/floppy.img
+wget -O /dev/fd0 http://toastball.net/toast-linux-tmp/floppy.img
 dd if=/dev/zero of=/dev/hda bs=512 count=1
 sync
 reboot