Merge pull request #19 from jmbaur/rework

Rework client/server relationship
jmbaur · May 9, 2024 · 4b86c7c · 4b86c7c
2 parents 3075f82 + 4f5266e
commit 4b86c7c
Show file tree

Hide file tree

Showing 16 changed files with 333 additions and 416 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/kernel-configs/generic b/kernel-configs/generic
@@ -49,6 +49,7 @@ CONFIG_IMA_APPRAISE_MODSIG=y
 CONFIG_IMA_DEFAULT_HASH_SHA256=y
 CONFIG_IMA_KEXEC=y
 CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y
+CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=y
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_INTEGRITY=y

diff --git a/kernel-configs/qemu b/kernel-configs/qemu
@@ -3,6 +3,7 @@ CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_E1000=y
 CONFIG_FW_CFG_SYSFS=y
 CONFIG_I2C_VIRTIO=y
+CONFIG_IKCONFIG=y
 CONFIG_NET_9P=y
 CONFIG_NET_9P_VIRTIO=y
 CONFIG_SCSI_VIRTIO=y

diff --git a/src/boot.zig b/src/boot.zig
@@ -216,7 +216,7 @@ fn autoboot(stop_fd: posix.fd_t) !bool {
 
     std.log.debug("autoboot started", .{});
 
-    var bls = BootLoaderSpec.init(std.heap.page_allocator);
+    var bls = BootLoaderSpec.init();
     var boot_loader: BootLoader = .{ .bls = &bls };
     defer {
         boot_loader.teardown();

diff --git a/src/boot/bls.zig b/src/boot/bls.zig
@@ -96,9 +96,9 @@ pub const BootLoaderSpec = struct {
     /// system). This includes USB mass-storage devices, SD cards, etc.
     external_mounts: []Mount,
 
-    pub fn init(backing_allocator: std.mem.Allocator) @This() {
+    pub fn init() @This() {
         return .{
-            .arena = std.heap.ArenaAllocator.init(backing_allocator),
+            .arena = std.heap.ArenaAllocator.init(std.heap.page_allocator),
             .internal_mounts = &.{},
             .external_mounts = &.{},
         };