vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ramfs' into 'master'

Browse source 
Include ramfs in initfs

See merge request redox-os/redox!1233
This commit is contained in:
Jeremy Soller 2020-04-04 18:53:46 +00:00
commit ad65dfe4bd
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cookbook

@ -1 +1 @@
Subproject commit ebda92aa7fd5f0183dd221107ac5a6a9c91b135f Subproject commit 00e837b6adf338e4b2fac3c7a27aa86e4bd7b6df

2
initfs.toml
View file

@ -10,6 +10,7 @@ prompt = false
drivers = {} drivers = {}
init = {} init = {}
nulld = {} nulld = {}
ramfs = {}
randd = {} randd = {}
redoxfs = {} redoxfs = {}
zerod = {} zerod = {}
@ -25,6 +26,7 @@ randd
vesad T T G vesad T T G
stdio display:1 stdio display:1
ps2d us ps2d us
ramfs logging
pcid /etc/pcid/initfs.toml pcid /etc/pcid/initfs.toml
redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK
cd file: cd file:

2
kernel

@ -1 +1 @@
Subproject commit 53570f01643032a8ab0a567c40180f516c32ffe7 Subproject commit 0ccf3b4e53fdaa7dbaa09a4d2d499c1f36d65e2b