Merge branch 'ramfs' into 'master'

Include ramfs in initfs See merge request redox-os/redox!1233
Remove ramfs from filesystem.toml.
2020-04-04 18:53:46 +00:00 · 2020-04-04 20:35:49 +02:00 · 2020-04-04 15:34:40 +02:00
3 changed files with 4 additions and 2 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit ebda92aa7fd5f0183dd221107ac5a6a9c91b135f
+Subproject commit 00e837b6adf338e4b2fac3c7a27aa86e4bd7b6df
--- a/initfs.toml
+++ b/initfs.toml
@ -10,6 +10,7 @@ prompt = false
 drivers = {}
 init = {}
 nulld = {}
 ramfs = {}
 randd = {}
 redoxfs = {}
 zerod = {}
@ -25,6 +26,7 @@ randd
 vesad T T G
 stdio display:1
 ps2d us
 ramfs logging
 pcid /etc/pcid/initfs.toml
 redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK
 cd file:
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 53570f01643032a8ab0a567c40180f516c32ffe7
+Subproject commit 0ccf3b4e53fdaa7dbaa09a4d2d499c1f36d65e2b
Author	SHA1	Message	Date
Jeremy Soller	ad65dfe4bd	Merge branch 'ramfs' into 'master' Include ramfs in initfs See merge request redox-os/redox!1233	2020-04-04 18:53:46 +00:00
4lDO2	ec2922ab4e	Remove ramfs from filesystem.toml.	2020-04-04 20:35:49 +02:00
4lDO2	059edcb96b	Include ramfs in initfs.	2020-04-04 15:34:40 +02:00
		`@ -1 +1 @@`
			`Subproject commit ebda92aa7fd5f0183dd221107ac5a6a9c91b135f`				`Subproject commit 00e837b6adf338e4b2fac3c7a27aa86e4bd7b6df`
		`@ -1 +1 @@`
			`Subproject commit 53570f01643032a8ab0a567c40180f516c32ffe7`				`Subproject commit 0ccf3b4e53fdaa7dbaa09a4d2d499c1f36d65e2b`