summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rwxr-xr-xbuildkernel.sh8
-rwxr-xr-xqemu.sh2
3 files changed, 9 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 8024dce..0e812a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ init
 init.cpio
 lib
 lib64
+iso
+nyaos.iso
diff --git a/buildkernel.sh b/buildkernel.sh
index e690b6b..05bee7f 100755
--- a/buildkernel.sh
+++ b/buildkernel.sh
@@ -32,5 +32,9 @@ INITPATH=$PWD/init.cpio
 cd init
 find . | cpio -o -H newc > ../init.cpio
 cd ../kernel
-make isoimage FDARGS="initrd=/init.cpio root=/dev/sr0 rootfstype=iso9660 ro" FDINITRD=$INITPATH -j 6
-cd ..
\ No newline at end of file
+make
+# make isoimage FDARGS="initrd=/init.cpio init=/sbin/init rdinit=/init root=/dev/root" FDINITRD=$INITPATH -j 6
+cd ..
+cp -f kernel/arch/x86/boot/bzImage ./iso/boot/vmlinuz
+cp -f ./init.cpio ./iso/boot/initramfs.cpio
+grub-mkrescue -o nyaos.iso iso
diff --git a/qemu.sh b/qemu.sh
index 8166d18..cba55ec 100755
--- a/qemu.sh
+++ b/qemu.sh
@@ -1 +1 @@
-qemu-system-x86_64 -cdrom ./kernel/arch/x86/boot/image.iso
\ No newline at end of file
+qemu-system-x86_64 -cdrom ./nyaos.iso
\ No newline at end of file