bootloader/bios/command_line.S

@@ -83,5 +83,5 @@ command_line_enter_msg:
 command_line:
 # 100 character command line
 command_line_buffer:
-	.ascii "root=/dev/sda2"
+	.ascii "root=UUID=9C87D2AF-566A-4517-971A-57BA86EEA88D"
 	.skip 100 - (. - command_line_buffer)

kernel/kernel/FS/VirtualFileSystem.cpp

@@ -8,7 +8,6 @@
 #include <kernel/Storage/Partition.h>
 #include <kernel/Timer/Timer.h>
 
-#include <ctype.h>
 #include <fcntl.h>
 
 namespace Kernel
@@ -29,10 +28,8 @@ namespace Kernel
 				if (!static_cast<Device*>(inode.ptr())->is_partition())
 					return BAN::Iteration::Continue;
 				auto* partition = static_cast<Partition*>(inode.ptr());
-				ASSERT(partition->uuid().size() == uuid.size());
+				if (partition->uuid() != uuid)
-				for (size_t i = 0; i < uuid.size(); i++)
+					return BAN::Iteration::Continue;
-					if (tolower(uuid[i]) != tolower(partition->uuid()[i]))
-						return BAN::Iteration::Continue;
 				result = partition;
 				return BAN::Iteration::Break;
 			}
@@ -62,14 +59,14 @@ namespace Kernel
 		BAN::StringView entry;
 		RootType type;
 
-		if (root_path.starts_with("PARTUUID="_sv))
+		if (root_path.size() >= 5 && root_path.substring(0, 5) == "UUID="_sv)
 		{
-			entry = root_path.substring(9);
+			entry = root_path.substring(5);
 			if (entry.size() != 36)
 				panic("Invalid UUID '{}'", entry);
 			type = RootType::PartitionUUID;
 		}
-		else if (root_path.starts_with("/dev/"_sv))
+		else if (root_path.size() >= 5 && root_path.substring(0, 5) == "/dev/"_sv)
 		{
 			entry = root_path.substring(5);
 			if (entry.empty() || entry.contains('/'))

kernel/kernel/IDT.cpp

@@ -381,7 +381,9 @@ namespace Kernel
 
 		Thread::current().save_sse();
 
-		if (InterruptController::get().is_in_service(irq))
+		if (!InterruptController::get().is_in_service(irq))
+			dprintln("spurious irq 0x{2H}", irq);
+		else
 		{
 			InterruptController::get().eoi(irq);
 			if (auto* handler = s_interruptables[irq])

kernel/kernel/Storage/ATA/AHCI/Controller.cpp

@@ -82,10 +82,8 @@ namespace Kernel
 		{
 			if (is & (1 << i))
 			{
-				if (m_devices[i])
+				ASSERT(m_devices[i]);
-					m_devices[i]->handle_irq();
+				m_devices[i]->handle_irq();
-				else
-					dwarnln("ignoring interrupt to device {}", i);
 			}
 		}
 

script/config.sh

@@ -33,3 +33,5 @@ if [[ -z $BANAN_BOOTLOADER ]]; then
 fi
 
 export BANAN_CMAKE=$BANAN_TOOLCHAIN_PREFIX/bin/cmake
+
+export BANAN_ROOT_PART_UUID='9C87D2AF-566A-4517-971A-57BA86EEA88D'

script/image-create.sh

@@ -46,6 +46,15 @@ else
 		mkpart root ext2 2M 100%
 fi
 
+fdisk "$BANAN_DISK_IMAGE_PATH" >/dev/null << EOF
+x
+u
+2
+$BANAN_ROOT_PART_UUID
+r
+w
+EOF
+
 # create loop device
 LOOP_DEV=$(sudo losetup --show  -fP "$BANAN_DISK_IMAGE_PATH" || exit 1 )
 PARTITION1=${LOOP_DEV}p1

script/install-bootloader.sh

@@ -32,58 +32,58 @@ fi
 
 set -u
 
-mount_dir="$BANAN_BUILD_DIR/mount"
+MOUNT_DIR="$BANAN_BUILD_DIR/mount"
-mkdir -p $mount_dir
+mkdir -p $MOUNT_DIR
 
 install_grub_legacy() {
-	sudo mount $partition2 "$mount_dir"
+	sudo mount $PARTITION2 "$MOUNT_DIR"
 	sudo grub-install						\
 		--no-floppy							\
 		--target=i386-pc					\
 		--modules="normal ext2 multiboot"	\
-		--boot-directory="$mount_dir/boot"	\
+		--boot-directory="$MOUNT_DIR/boot"	\
-		$loop_dev
+		$LOOP_DEV
-	sudo mkdir -p "$mount_dir/boot/grub"
+	sudo mkdir -p "$MOUNT_DIR/boot/grub"
-	sudo cp "$BANAN_BUILD_DIR/grub-legacy-boot.cfg" "$mount_dir/boot/grub/grub.cfg"
+	sed "s/<ROOT>/UUID=$BANAN_ROOT_PART_UUID/" "$BANAN_TOOLCHAIN_DIR/grub-legacy-boot.cfg" | sudo tee "$MOUNT_DIR/boot/grub/grub.cfg" >/dev/null
-	sudo umount "$mount_dir"
+	sudo umount "$MOUNT_DIR"
 }
 
 install_grub_uefi() {
-	sudo mkfs.fat $partition1 > /dev/null
+	sudo mkfs.fat $PARTITION1 > /dev/null
-	sudo mount $partition1 "$mount_dir"
+	sudo mount $PARTITION1 "$MOUNT_DIR"
-	sudo mkdir -p "$mount_dir/EFI/BOOT"
+	sudo mkdir -p "$MOUNT_DIR/EFI/BOOT"
-	sudo "$BANAN_TOOLCHAIN_PREFIX/bin/grub-mkstandalone" -O "$BANAN_ARCH-efi" -o "$mount_dir/EFI/BOOT/BOOTX64.EFI" "boot/grub/grub.cfg=$BANAN_BUILD_DIR/grub-memdisk.cfg"
+	sudo "$BANAN_TOOLCHAIN_PREFIX/bin/grub-mkstandalone" -O "$BANAN_ARCH-efi" -o "$MOUNT_DIR/EFI/BOOT/BOOTX64.EFI" "boot/grub/grub.cfg=$BANAN_TOOLCHAIN_DIR/grub-memdisk.cfg"
-	sudo umount "$mount_dir"
+	sudo umount "$MOUNT_DIR"
 
-	sudo mount $partition2 "$mount_dir"
+	sudo mount $PARTITION2 "$MOUNT_DIR"
-	sudo mkdir -p "$mount_dir/boot/grub"
+	sudo mkdir -p "$MOUNT_DIR/boot/grub"
-	sudo cp "$BANAN_BUILD_DIR/grub-uefi.cfg" "$mount_dir/boot/grub/grub.cfg"
+	sed "s/<ROOT>/UUID=$BANAN_ROOT_PART_UUID/" "$BANAN_TOOLCHAIN_DIR/grub-uefi.cfg" | sudo tee "$MOUNT_DIR/boot/grub/grub.cfg" >/dev/null
-	sudo umount "$mount_dir"
+	sudo umount "$MOUNT_DIR"
 }
 
 install_banan_legacy() {
-	root_disk_info=$(fdisk -x "$BANAN_DISK_IMAGE_PATH" | tr -s ' ')
+	ROOT_DISK_INFO=$(fdisk -x "$BANAN_DISK_IMAGE_PATH" | tr -s ' ')
-	root_part_guid=$(echo "$root_disk_info" | grep "^$BANAN_DISK_IMAGE_PATH" | head -2 | tail -1 | cut -d' ' -f6)
+	ROOT_PART_GUID=$(echo "$ROOT_DISK_INFO" | grep "^$BANAN_DISK_IMAGE_PATH" | head -2 | tail -1 | cut -d' ' -f6)
 
-	installer_build_dir=$BANAN_ROOT_DIR/bootloader/installer/build/$BANAN_ARCH
+	INSTALLER_BUILD_DIR=$BANAN_ROOT_DIR/bootloader/installer/build/$BANAN_ARCH
-	bootloader_elf=$BANAN_BUILD_DIR/bootloader/bios/bootloader
+	BOOTLOADER_ELF=$BANAN_BUILD_DIR/bootloader/bios/bootloader
 
-	if [ ! -f $bootloader_elf ]; then
+	if [ ! -f $BOOTLOADER_ELF ]; then
 		echo "You must build the bootloader first" >&2
 		exit 1
 	fi
 
-	if [ ! -d $installer_build_dir ]; then
+	if [ ! -d $INSTALLER_BUILD_DIR ]; then
-		mkdir -p $installer_build_dir
+		mkdir -p $INSTALLER_BUILD_DIR
-		cd $installer_build_dir
+		cd $INSTALLER_BUILD_DIR
 		$BANAN_CMAKE -G Ninja ../..
 	fi
 
-	cd $installer_build_dir
+	cd $INSTALLER_BUILD_DIR
 	ninja
 
 	echo installing bootloader
-	$installer_build_dir/banan_os-bootloader-installer "$bootloader_elf" "$BANAN_DISK_IMAGE_PATH" "$root_part_guid"
+	$INSTALLER_BUILD_DIR/banan_os-bootloader-installer "$BOOTLOADER_ELF" "$BANAN_DISK_IMAGE_PATH" "$ROOT_PART_GUID"
 }
 
 install_banan_uefi() {
@@ -92,34 +92,23 @@ install_banan_uefi() {
 }
 
 if [ $BANAN_BOOTLOADER = "GRUB" ]; then
-	loop_dev=$(sudo losetup --show -fP $BANAN_DISK_IMAGE_PATH || exit 1)
+
-	partition1=${loop_dev}p1
+	LOOP_DEV=$(sudo losetup --show -fP $BANAN_DISK_IMAGE_PATH || exit 1)
-	partition2=${loop_dev}p2
+	PARTITION1=${LOOP_DEV}p1
-	if [ ! -b $partition1 ] || [ ! -b $partition2 ]; then
+	PARTITION2=${LOOP_DEV}p2
+	if [ ! -b $PARTITION1 ] || [ ! -b $PARTITION2 ]; then
 		echo "Failed to probe partitions for banan disk image." >&2
-		sudo losetup -d $loop_dev
+		sudo losetup -d $LOOP_DEV
 		exit 1
 	fi
 
-	root_part_info=$(sudo blkid $partition2)
-
-	root_fs_uuid=$(grep -Pwo 'UUID=".*?"' <<< "$root_part_info")
-	root_fs_uuid=${root_fs_uuid:6:36}
-
-	root_part_uuid=$(grep -Pwo 'PARTUUID=".*?"' <<< "$root_part_info")
-	root_part_uuid=${root_part_uuid:10:36}
-
-	cp "$BANAN_TOOLCHAIN_DIR"/grub-*.cfg "$BANAN_BUILD_DIR/"
-	sed -i "s/<ROOT>/PARTUUID=$root_part_uuid/" "$BANAN_BUILD_DIR"/grub-*.cfg
-	sed -i "s/<ROOT_FS>/$root_fs_uuid/" "$BANAN_BUILD_DIR"/grub-*.cfg
-
 	if (($BANAN_UEFI_BOOT)); then
 		install_grub_uefi
 	else
 		install_grub_legacy
 	fi
 
-	sudo losetup -d $loop_dev
+	sudo losetup -d $LOOP_DEV
 
 elif [ $BANAN_BOOTLOADER = "BANAN" ]; then
 	if (($BANAN_UEFI_BOOT)); then

toolchain/grub-memdisk.cfg

@@ -1,5 +1,2 @@
 insmod part_gpt
-insmod search_fs_uuid
+configfile (hd0,gpt2)/boot/grub/grub.cfg
-
-search --no-floppy --fs-uuid --set=root <ROOT_FS>
-configfile /boot/grub/grub.cfg

toolchain/grub-uefi.cfg

@@ -1,7 +1,5 @@
 insmod part_gpt
-insmod search_fs_uuid
+set root=(hd0,gpt2)
-
-search --no-floppy --fs-uuid --set=root <ROOT_FS>
 
 insmod all_video