Including bochs run script (run.sh), moved Dux.iso to iso/

duckinator · Dec 20, 2009 · 12f034e · 12f034e
1 parent 11cf941
commit 12f034e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/SConstruct b/SConstruct
@@ -42,4 +42,4 @@ Export('env', 'arch', 'buildtype', 'distreq')
 
 SConscript('src/SConscript')
 
-env.Iso('Dux.iso', distreq)
+env.Iso('iso/Dux.iso', distreq)
diff --git a/iso/bochsrc b/iso/bochsrc
@@ -0,0 +1,3 @@
+boot: cdrom
+ata0-master: type=cdrom, path=Dux.iso, status=inserted
+
diff --git a/makeiso.sh b/makeiso.sh
@@ -52,4 +52,5 @@ echo "title Metodo Dux with Userland and initrd" >> isofs/boot/grub/menu.lst
 echo "kernel /System/metodo.exe" >> isofs/boot/grub/menu.lst
 echo "module /System/userland.exe" >> isofs/boot/grub/menu.lst
 echo "module /System/initrd.img" >> isofs/boot/grub/menu.lst
-$isocmd -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -input-charset utf-8 -o Dux.iso isofs
+mkdir -p iso
+$isocmd -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -input-charset utf-8 -o iso/Dux.iso isofs
diff --git a/run.sh b/run.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd iso
+bochs -q
+
diff --git a/tools/initrd/initrd.img b/tools/initrd/initrd.img