Merge branch 'master-MR-enygmator' into 'master'

FIX minimal.toml and Bochs (bochs.x86_64)

See merge request redox-os/redox!1270
This commit is contained in:
Jeremy Soller 2022-05-30 11:39:02 +00:00
commit 45c3b9eafb
2 changed files with 19 additions and 5 deletions

View file

@ -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: -

View file

@ -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]]