--- toast-linux	2005/02/06 08:09:19	1.135
+++ toast-linux	2005/02/06 08:41:53	1.136
@@ -1705,7 +1705,7 @@
 
 WGET = wget
 
-FROMCONF = dev toast-linux.stub mkhd bochs-config toast.vmx sbin/setup logotoppm
+FROMCONF = dev toast-linux.stub mkhd floppy.vmx cd.vmx sbin/setup logotoppm
 FROMCONF2 = smartcat linux-config-smallk linux-config-largek busybox-config
 
 PKGS = TOOLCHAIN LINUX BUSYBOX E2FSPROGS NTFSPROGS PARTED DEVMAP LVM2 GENEXT2FS MTOOLS SYSLINUX CDRTOOLS
@@ -2017,21 +2017,16 @@
 chroot: sbin/setup
   TOAST_NICE=5 sbin/setup
 
-vmware: floppy.img floppy.iso vmclean toast.vmx
+vmware: vmware-floppy
+
+vmware-floppy: floppy.img floppy.iso vmclean floppy.vmx
   vmware-vdiskmanager -c -a buslogic -s 16gb -t 1 toast.vmdk
-  vmware -x toast.vmx
+  vmware -x floppy.vmx
 
-bochs: floppy.img bochs-config mkhd
-  ./mkhd hda.img $(HDA_CYLINDERS)
-  HDA_CYLINDERS=$(HDA_CYLINDERS) bochs -qf bochs-config
+vmware-cd: cd.iso vmclean cd.vmx
+  vmware-vdiskmanager -c -a buslogic -s 16gb -t 1 toast.vmdk
+  vmware -x cd.vmx
 
-bochs-cd: floppy.iso bochs-config-cd mkhd
-  ./mkhd hda.img $(HDA_CYLINDERS)
-  HDA_CYLINDERS=$(HDA_CYLINDERS) bochs -qf bochs-config-cd
-
-bochs-config-cd: bochs-config
-  perl -pe 's/(^boot:) floppy/$$1 cdrom/; s/inserted/ejected/ if /floppy/; s/ejected/inserted/ if /cdrom/' $< > $@
-
 config-linux-%: %/.config
   $(MAKE) -C $(LINUX_DIR) O=$(CURDIR)/$* menuconfig
   cp $< linux-config-$*
@@ -2330,54 +2325,7 @@
 truncate(HD, $size) || die("truncate $outfile: $!");
 close(HD) || die("close $outfile: $!");
 
---- FILE bochs-config ---
-# configuration file generated by Bochs
-config_interface: textconfig
-display_library: x
-megs: 64
-romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000
-vgaromimage: $BXSHARE/VGABIOS-elpin-2.40
-boot: floppy
-floppya: 1_44="floppy.img", status=inserted
-# no floppyb
-ata0: enabled=1, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14
-ata1: enabled=1, ioaddr1=0x170, ioaddr2=0x370, irq=15
-ata2: enabled=0
-ata3: enabled=0
-ata0-master: type=disk, path="hda.img", mode=flat, cylinders=$HDA_CYLINDERS, heads=16, spt=63
-ata1-master: type=cdrom, path="floppy.iso", status=ejected
-parport1: enabled=1, file=""
-com1: enabled=1, dev=""
-usb1: enabled=1, ioaddr=0xff80, irq=10
-# no sb16
-floppy_bootsig_check: disabled=0
-vga_update_interval: 30000
-keyboard_serial_delay: 2000
-keyboard_paste_delay: 10000
-floppy_command_delay: 50000
-ips: 8000000
-text_snapshot_check: 0
-mouse: enabled=0
-private_colormap: enabled=0
-i440fxsupport: enabled=0
-clock: sync=none, time0=local
-# no ne2k
-newharddrivesupport: enabled=1
-# no loader
-log: -
-logprefix: %t%e%d
-debugger_log: -
-panic: action=fatal
-error: action=report
-info: action=report
-debug: action=ignore
-pass: action=fatal
-keyboard_mapping: enabled=0, map=
-keyboard_type: mf
-user_shortcut: keys=ctrlaltdel
-# no cmosimage
-
---- FILE toast.vmx ---
+--- FILE floppy.vmx ---
 #!/usr/bin/vmware
 config.version = "7"
 virtualHW.version = "3"
@@ -2399,6 +2347,25 @@
 sound.present = "FALSE"
 disable_acceleration = "TRUE"
 
+--- FILE cd.vmx ---
+#!/usr/bin/vmware
+config.version = "7"
+virtualHW.version = "3"
+displayName = "toast linux"
+guestOS = "other26xlinux"
+memsize = "256"
+scsi0.present = "TRUE"
+scsi0:0.present = "TRUE"
+scsi0:0.fileName = "toast.vmdk"
+scsi0:0.mode = "undoable"
+ide1:0.present = "TRUE"
+ide1:0.fileName = "cd.iso"
+ide1:0.deviceType = "cdrom-image"
+ide1:0.startConnected = "TRUE"
+Ethernet0.present = "TRUE"
+sound.present = "FALSE"
+disable_acceleration = "TRUE"
+
 --- FILE floppy/syslinux.cfg ---
 display logo
 prompt 1
@@ -3577,7 +3544,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.10
-# Sat Feb  5 15:15:51 2005
+# Sun Feb  6 00:26:50 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -4687,7 +4654,7 @@
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
+CONFIG_FB_VGA16=y
 CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
 # CONFIG_FB_HGA is not set
@@ -4714,7 +4681,10 @@
 CONFIG_VGA_CONSOLE=y
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
 
 #
 # Logo configuration