Code-base clean-up and refactoring (#47)

[lunaix-os.git] / lunaix-os / live_debug.sh

diff --git a/lunaix-os/live_debug.sh b/lunaix-os/live_debug.sh
index d18932947f15bef717c2e450dc0f3800ce835525..71da3355cb25be1037d04beda140345b77301c1b 100755 (executable)
--- a/lunaix-os/live_debug.sh
+++ b/lunaix-os/live_debug.sh
@@ -4,15 +4,20 @@ hmp_port=45454
 gdb_port=1234
 default_cmd="console=/dev/ttyS0"
 
 gdb_port=1234
 default_cmd="console=/dev/ttyS0"
 

-make CMDLINE=${default_cmd} ARCH=${ARCH} MODE=${MODE:-debug} image -j5 || exit -1
+make CMDLINE=${default_cmd} ARCH=${ARCH} MODE=${MODE:-debug} all -j5 || exit -1

 
 ./scripts/qemu.py \
     scripts/qemus/qemu_x86_dev.json \
     --qemu-dir "${QEMU_DIR}" \
 
 ./scripts/qemu.py \
     scripts/qemus/qemu_x86_dev.json \
     --qemu-dir "${QEMU_DIR}" \

-    -v KIMG=build/lunaix.iso \

     -v QMPORT=${hmp_port} \
     -v GDB_PORT=${gdb_port} \
     -v QMPORT=${hmp_port} \
     -v GDB_PORT=${gdb_port} \

-    -v EXT2_TEST_DISC=machine/test_part.ext2 \
-    -v ARCH=${ARCH} &
+    -v ROOTFS=lunaix_rootfs.ext2 \
+    -v ARCH=${ARCH} \
+    -v KBIN=build/bin/kernel.bin \
+    -v "KCMD=${default_cmd} rootfs=/dev/block/sda init=/bin/init" \
+    -- \
+    -nographic &

 
 

-QMPORT=${hmp_port} gdb build/bin/kernel.bin -ex "target remote localhost:${gdb_port}"
\ No newline at end of file
+QMPORT=${hmp_port} gdb-multiarch \
+    build/bin/kernel.bin \
+    -ex "target remote localhost:${gdb_port}"
\ No newline at end of file