doh! ok now here's the patch REALLY
Index: conf/cooperative
===================================================================
RCS file: /cvsroot-plex86/plex86/conf/cooperative,v
retrieving revision 1.2
diff -u -r1.2 cooperative
--- conf/cooperative    2000/11/24 02:24:52     1.2
+++ conf/cooperative    2000/11/25 04:46:25
@@ -34,9 +34,7 @@
 plugin = ./plugins/misc/replay_io.so file=../misc/vga_io.log
 
 #====== Cooperative ==================================================
-plugin = ./plugins/loader/load-kernel.so \
-  file=../guest/cooperative/kernel \
-  stack=36864
+plugin = ./plugins/loader/load-kernel.so file=../guest/cooperative/kernel stack=36864
 
 ####################################################################
 # Debugging settings
Index: conf/linux
===================================================================
RCS file: /cvsroot-plex86/plex86/conf/linux,v
retrieving revision 1.4
diff -u -r1.4 linux
--- conf/linux  2000/11/24 02:24:52     1.4
+++ conf/linux  2000/11/25 04:46:25
@@ -17,7 +17,7 @@
 
 plugin = ./plugins/bochs/plugin-bochs.so
 bochs-opt boot: a
-bochs-opt floppya: 1_44=../../1.44a, status=inserted
+bochs-opt floppya: 1_44=../../rescue.bin, status=inserted
 bochs-opt keyboard_serial_delay: 200
 bochs-opt floppy_command_delay: 500
 bochs-opt vga_update_interval: 300000
@@ -40,12 +40,7 @@
 # The VGA BIOS
 load-rom: file=../bios/VGABIOS-elpin-2.40, address=0xc0000
 
-plugin = ./plugins/loader/load-kernel.so \
-  file=../../linux.img \
-  address=0x100000 \
-  stack=36864 \
-  rd=0x00e80000:../../initrd.img \
-  hack=linux
+plugin = ./plugins/loader/load-kernel.so file=../../rescue.bin address=0x100000 
+stack=36864 hack=linux
 
 
 
Index: conf/paging
===================================================================
RCS file: /cvsroot-plex86/plex86/conf/paging,v
retrieving revision 1.2
diff -u -r1.2 paging
--- conf/paging 2000/11/24 02:24:52     1.2
+++ conf/paging 2000/11/25 04:46:26
@@ -34,9 +34,7 @@
 plugin = ./plugins/misc/replay_io.so file=../misc/vga_io.log
 
 #====== Paging =======================================================
-plugin = ./plugins/loader/load-kernel.so \
-  file=../guest/paging/kernel \
-  stack=36864
+plugin = ./plugins/loader/load-kernel.so file=../guest/paging/kernel stack=36864
 
 
 ####################################################################
Index: conf/preemptive
===================================================================
RCS file: /cvsroot-plex86/plex86/conf/preemptive,v
retrieving revision 1.2
diff -u -r1.2 preemptive
--- conf/preemptive     2000/11/24 02:24:52     1.2
+++ conf/preemptive     2000/11/25 04:46:26
@@ -33,27 +33,16 @@
 # program the VGA adapter, without booting via the BIOS.
 plugin = ./plugins/misc/replay_io.so file=../misc/vga_io.log
 
-plugin = ./plugins/loader/load-kernel.so \
-  file=../guest/preemptive/kernel \
-  stack=36864
+plugin = ./plugins/loader/load-kernel.so file=../guest/preemptive/kernel stack=36864
 
 #====== Cooperative ==================================================
-#plugin = ./plugins/loader/load-kernel.so \
-#  file=../guest/cooperative/kernel \
-#  stack=36864
+#plugin = ./plugins/loader/load-kernel.so file=../guest/cooperative/kernel stack=36864
 
 #====== Paging =======================================================
-#plugin = ./plugins/loader/load-kernel.so \
-#  file=../guest/paging/kernel \
-#  stack=36864
+#plugin = ./plugins/loader/load-kernel.so file=../guest/paging/kernel stack=36864
 
 #====== Linux ========================================================
-#plugin = ./plugins/loader/load-kernel.so \
-#  file=../../linux.img \
-#  address=0x100000 \
-#  stack=36864 \
-#  rd=0x00e80000:../../initrd.img \
-#  hack=linux
+#plugin = ./plugins/loader/load-kernel.so file=../../linux.img address=0x100000 
+stack=36864 rd=0x00e80000:../../initrd.img hack=linux
 
 #plugin = ./plugins/ice/plugin-ice.so 3141
 
Index: conf/tmp
===================================================================
RCS file: /cvsroot-plex86/plex86/conf/tmp,v
retrieving revision 1.2
diff -u -r1.2 tmp
--- conf/tmp    2000/11/24 02:24:52     1.2
+++ conf/tmp    2000/11/25 04:46:26
@@ -34,9 +34,7 @@
 plugin = ./plugins/misc/replay_io.so file=../misc/vga_io.log
 
 #====== Paging =======================================================
-plugin = ./plugins/loader/load-kernel.so \
-  file=/tmp/kernel.elf \
-  stack=36864
+plugin = ./plugins/loader/load-kernel.so file=/tmp/kernel.elf stack=36864
 
 
 ####################################################################

PGP signature

Reply via email to