aero.py: use the disk image

Signed-off-by: Andy-Python-Programmer <andypythonappdeveloper@gmail.com>

Author: Andy-Python-Programmer

aero.py

@@ -476,6 +476,13 @@ def prepare_iso(args, kernel_bin, user_bins):
 
         return None
 
+    # create the disk image
+    disk_path = os.path.join(BUILD_DIR, 'disk.img')
+
+    if not os.path.exists(disk_path):
+        log_info('creating disk image')
+        os.system('bash ./tools/mkimage.sh')
+
     return iso_path
 
 
@@ -486,7 +493,10 @@ def run_in_emulator(build_info: BuildInfo, iso_path):
     qemu_args = ['-cdrom', iso_path,
                  '-m', args.memory,
                  '-smp', '1',
-                 '-serial', 'stdio']
+                 '-serial', 'stdio',
+                 '-drive', 'file=build/disk.img,if=none,id=NVME1', '-device', 'nvme,drive=NVME1,serial=nvme',
+                 # Specify the boot order (where `d` is the first CD-ROM drive)
+                 '--boot', 'd']
 
     if args.bios == 'uefi':
         qemu_args += ['-bios',

tools/mkimage.sh

@@ -1,14 +1,18 @@
+#!/bin/bash
+
 # sync the sysroot
 echo "sysroot: syncing base-files"
 cp -r base-files/. sysroot/system-root/
 
+IMAGE_PATH=build/disk.img
+
 # make the disk image
-rm -rf disk.img
+rm -rf $IMAGE_PATH
 
-dd if=/dev/zero bs=1G count=0 seek=512 of=disk.img
-parted -s disk.img mklabel gpt
-parted -s disk.img mkpart primary 2048s 100%
-sudo losetup -Pf --show disk.img > loopback_dev
+dd if=/dev/zero bs=1G count=0 seek=512 of=$IMAGE_PATH
+parted -s $IMAGE_PATH mklabel gpt
+parted -s $IMAGE_PATH mkpart primary 2048s 100%
+sudo losetup -Pf --show $IMAGE_PATH > loopback_dev
 sudo mkfs.ext2 `cat loopback_dev`p1 -I128
 rm -rf disk_image/
 mkdir disk_image