From fb5cd8e60bf41efc4a99217a23fc4a35a1f5cb30 Mon Sep 17 00:00:00 2001
From: Jackson Abney <44131234+hickorysb@users.noreply.github.com>
Date: Thu, 10 Apr 2025 19:39:42 -0800
Subject: [PATCH] Update BuiltinDevices.java

Use buildroot bootfs
---
 src/main/java/li/cil/oc2/common/vm/BuiltinDevices.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/java/li/cil/oc2/common/vm/BuiltinDevices.java b/src/main/java/li/cil/oc2/common/vm/BuiltinDevices.java
index 938304b5..4d36ccbf 100644
--- a/src/main/java/li/cil/oc2/common/vm/BuiltinDevices.java
+++ b/src/main/java/li/cil/oc2/common/vm/BuiltinDevices.java
@@ -51,14 +51,9 @@ public final class BuiltinDevices {
         uart = initialize(context, new UART16550A(), UART_INTERRUPT, UART16550A::getInterrupt);
         vfs = initialize(context, new VirtIOFileSystemDevice(context.getMemoryMap(), "builtin", FileSystems.getLayeredFileSystem()), VFS_INTERRUPT, VirtIOFileSystemDevice::getInterrupt);
         InputStream ris = Buildroot.getRootFilesystem();
+        InputStream bis = Buildroot.getBootFilesystem();
         try {
-            var bfsd = FileSystems.getBlockByName("bootfs");
-            if (bfsd != null) {
-                bfs = initialize(context, new VirtIOBlockDevice(context.getMemoryMap(), bfsd.getBlockDevice()), BFS_INTERRUPT, VirtIOBlockDevice::getInterrupt);
-            }
-            else {
-                bfs = null;
-            }
+            bfs = initialize(context, new VirtIOBlockDevice(context.getMemoryMap(), ByteBufferBlockDevice.createFromStream(bis, true)), BFS_INTERRUPT, VirtIOBlockDevice::getInterrupt);
             rfs = initialize(context, new VirtIOBlockDevice(context.getMemoryMap(), ByteBufferBlockDevice.createFromStream(ris, true)), RFS_INTERRUPT, VirtIOBlockDevice::getInterrupt);
         }
         catch(final IOException e) {