bochs boot from cdrom; improve mkiso.sh

diff --git a/.bochsrc b/.bochsrc
index 04ffc271a9a8ffded5c00855958d432dc059a8dc..c4df1705ecd09c366a58b9dc77a51a1a8f874f55 100644 (file)
--- a/.bochsrc
+++ b/.bochsrc
@@ -762,6 +762,7 @@ ata3: enabled=0, ioaddr1=0x168, ioaddr2=0x360, irq=9
 #   ata3-slave:  type=cdrom, path=iso.sample, status=inserted
 #=======================================================================
 ata0-master: type=disk, mode=flat, path="HD.IMG", model="Generic aBCd"
+ata0-slave: type=cdrom, path=kernel.iso, status=inserted
 #ata0-master: type=disk, mode=flat, path="30M.sample"
 #ata0-master: type=disk, mode=flat, path="30M.sample", cylinders=615, heads=6, spt=17
 #ata0-master: type=disk, mode=flat, path="c.img", cylinders=0 # autodetect
@@ -783,7 +784,7 @@ ata0-master: type=disk, mode=flat, path="HD.IMG", model="Generic aBCd"
 #   boot: cdrom, floppy, disk
 #=======================================================================
 #boot: floppy
-boot: disk
+boot: cdrom
 
 #=======================================================================
 # FLOPPY_BOOTSIG_CHECK: disabled=[0|1]

diff --git a/mkiso.sh b/mkiso.sh
index 5795da390d25c48d0c3430e8143e19d0d7277f35..00f6c956b7a00975923f2846ae497ad2386ee1b5 100755 (executable)
--- a/mkiso.sh
+++ b/mkiso.sh
@@ -1,4 +1,14 @@
-CONTAINER_ID=78a
+
+if [ $# -ne 1 ]; then
+    docker ps -a
+    echo "input containerid "
+    read CONTAINER_ID
+else
+    CONTAINER_ID=$1
+fi
+
+echo "container id ${CONTAINER_ID}"
+
 docker exec -it $CONTAINER_ID /bin/bash -c "cd /root/workspace/kernel && ./scripts/mkiso.sh"