Configure bochs to run using image

jsanders · jsanders · commit 3914cac25937 · 2013-08-29T00:14:47.000-06:00
diff --git a/.bochsrc b/.bochsrc
@@ -0,0 +1,11 @@
+megs: 32
+romimage: file=/usr/share/bochs/BIOS-bochs-latest
+vgaromimage: file=/usr/share/bochs/VGABIOS-lgpl-latest
+ata0: enabled=1, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14
+ata0-slave: type=cdrom, path="dist/jdsos.iso", status=inserted
+boot: cdrom
+log: log/bochs.log
+mouse: enabled=0
+clock: sync=realtime
+cpu: ips=70000000
+display_library: sdl
diff --git a/Makefile b/Makefile
@@ -51,5 +51,8 @@ dist/jdsos.iso: dist/ image/boot/jdsos.bin
 
 dist: dist/jdsos.iso
 
+bochs: dist/jdsos.iso
+	bochs -f .bochsrc
+
 clean:
 	rm -f build/* dist/* image/boot/*.bin
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 apt-get update
-apt-get install -y build-essential gdb nasm bochs bochs-x bochs-sdl
+apt-get install -y build-essential gdb nasm xorriso qemu-system bochs bochs-x bochs-sdl
diff --git a/log/.gitkeep b/log/.gitkeep
