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:
commit
45c3b9eafb
22
bochs.x86_64
22
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
|
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
|
magic_break: enabled=1
|
||||||
|
|
||||||
|
#uncomment to choose either display library to use
|
||||||
|
#display_library: sdl2
|
||||||
display_library: x, options="gui_debug"
|
display_library: x, options="gui_debug"
|
||||||
|
|
||||||
log: -
|
log: -
|
||||||
|
|
|
@ -9,6 +9,7 @@ prompt = false
|
||||||
[packages]
|
[packages]
|
||||||
ipcd = {}
|
ipcd = {}
|
||||||
ptyd = {}
|
ptyd = {}
|
||||||
|
drivers = {}
|
||||||
|
|
||||||
# User settings
|
# User settings
|
||||||
[users.root]
|
[users.root]
|
||||||
|
@ -27,6 +28,7 @@ path = "/etc/init.d/00_base"
|
||||||
data = """
|
data = """
|
||||||
ipcd
|
ipcd
|
||||||
ptyd
|
ptyd
|
||||||
|
pcid /etc/pcid.d/
|
||||||
"""
|
"""
|
||||||
|
|
||||||
[[files]]
|
[[files]]
|
||||||
|
|
Loading…
Reference in a new issue