From 0a1323f3695f916f9c8eafbf244da3fcd36426f4 Mon Sep 17 00:00:00 2001 From: Tarun Aditya Thurlapati Date: Mon, 30 May 2022 15:34:30 +0530 Subject: [PATCH 1/2] FIX minimal.toml ADD `drivers` package to minimal.toml (cherry picked from commit 9a8fac4871976462868af9cae99b1baabc76ac61) --- config/minimal.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/minimal.toml b/config/minimal.toml index b46c6e2..da5c3f0 100644 --- a/config/minimal.toml +++ b/config/minimal.toml @@ -9,6 +9,7 @@ prompt = false [packages] ipcd = {} ptyd = {} +drivers = {} # User settings [users.root] @@ -27,6 +28,7 @@ path = "/etc/init.d/00_base" data = """ ipcd ptyd +pcid /etc/pcid.d/ """ [[files]] From 5f1bcd5f252b2b6577c9ca450fb561558fd5825f Mon Sep 17 00:00:00 2001 From: Tarun Aditya Thurlapati Date: Mon, 30 May 2022 15:35:40 +0530 Subject: [PATCH 2/2] FIX bochs 1. Bochs works with the bxrc now. (disabled CPU ) 2. added some new options (commented) (cherry picked from commit a71f46b86a7812300e165320180ccc1733f9bc16) --- bochs.x86_64 | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/bochs.x86_64 b/bochs.x86_64 index 2a5837e..ec6fd4a 100644 --- a/bochs.x86_64 +++ b/bochs.x86_64 @@ -1,11 +1,23 @@ -ata0-master: type=disk, path="build/harddrive.bin", mode=flat -boot: disk -com1: enabled=1, mode=file, dev=build/serial.log -cpu: model=corei7_haswell_4770 -#e1000: enabled=1, mac=52:54:00:12:34:56 ethmod=vnet megs: 1024 +boot: disk +ata0-master: type=disk, path="build/harddrive.bin", mode=flat + +#com1: enabled=1, mode=file, dev=build/serial.log +#cpu: model=corei7_haswell_4770 +#e1000: enabled=1, mac=52:54:00:12:34:56 ethmod=vnet + + +# enable "cirrus" SVGA. Note that neither this nor VBE works perfectly +#vga: extension=cirrus +#vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest-cirrus + +#vga: extension=vbe + magic_break: enabled=1 + +#uncomment to choose either display library to use +#display_library: sdl2 display_library: x, options="gui_debug" log: -