Boot framework rework (#45)

[lunaix-os.git] / lunaix-os / scripts / qemus / qemu_x86_dev.json

diff --git a/lunaix-os/scripts/qemus/qemu_x86_dev.json b/lunaix-os/scripts/qemus/qemu_x86_dev.json
index 60b292e780949cd3b0af72ee63bb3706827e2ab1..8f39682ce1904392767c7fd199d195679eae3562 100644 (file)
--- a/lunaix-os/scripts/qemus/qemu_x86_dev.json
+++ b/lunaix-os/scripts/qemus/qemu_x86_dev.json
@@ -19,6 +19,10 @@
             "apic"
         ]
     },
             "apic"
         ]
     },

+    "kernel": {
+        "bin": "$KBIN",
+        "cmd": "$KCMD"
+    },

     "debug": {
         "gdb_port": "$GDB_PORT",
         "traced": [
     "debug": {
         "gdb_port": "$GDB_PORT",
         "traced": [


@@ -57,15 +61,9 @@
             "class": "ahci",
             "name": "ahci_0",
             "disks": [
             "class": "ahci",
             "name": "ahci_0",
             "disks": [

-                {
-                    "type": "ide-cd",
-                    "img": "$KIMG",
-                    "ro": true,
-                    "format": "raw"
-                },

                 {
                     "type": "ide-hd",
                 {
                     "type": "ide-hd",

-                    "img": "$EXT2_TEST_DISC",
+                    "img": "$ROOTFS",

                     "format": "raw"
                 }
             ]
                     "format": "raw"
                 }
             ]