From 3ee3ab1c64950af54d909e7dd41a99b8ede327dd Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sat, 15 Jun 2019 09:05:02 -0600
Subject: [PATCH] Move nulld, randd, and zerod to initfs

---
 config/acid.toml     | 9 +++------
 config/coreboot.toml | 9 +++------
 config/desktop.toml  | 9 +++------
 config/minimal.toml  | 9 +++------
 config/server.toml   | 9 +++------
 initfs.toml          | 6 ++++++
 initfs_coreboot.toml | 6 ++++++
 initfs_live.toml     | 6 ++++++
 8 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/config/acid.toml b/config/acid.toml
index 66661b0..8185b48 100644
--- a/config/acid.toml
+++ b/config/acid.toml
@@ -90,7 +90,7 @@ logd = {}
 #netutils = {}
 #newlib = {}
 #newlibtest = {}
-nulld = {}
+#nulld = {}
 #openjazz = {}
 #openssl = {}
 #openttd = {}
@@ -115,7 +115,7 @@ nulld = {}
 ptyd = {}
 #python = {}
 #qemu = {}
-randd = {}
+#randd = {}
 #readline = {} # ncurses
 #redoxfs = {}
 #redox-ssh = {}
@@ -156,7 +156,7 @@ randd = {}
 #webrender = {}
 #winit = {}
 #xz = {}
-zerod = {}
+#zerod = {}
 #zlib = {}
 
 # User settings
@@ -174,9 +174,6 @@ password = ""
 [[files]]
 path = "/etc/init.d/00_base"
 data = """
-nulld
-zerod
-randd
 ipcd
 logd
 ptyd
diff --git a/config/coreboot.toml b/config/coreboot.toml
index 4fe8ff1..4c8ea17 100644
--- a/config/coreboot.toml
+++ b/config/coreboot.toml
@@ -90,7 +90,7 @@ ipcd = {}
 #netutils = {}
 #newlib = {}
 #newlibtest = {}
-nulld = {}
+#nulld = {}
 #openjazz = {}
 #openssl = {}
 #openttd = {}
@@ -118,7 +118,7 @@ orbutils-orblogin = {}
 ptyd = {}
 #python = {}
 #qemu = {}
-randd = {}
+#randd = {}
 #readline = {} # ncurses
 #redoxfs = {}
 #redox-ssh = {}
@@ -159,7 +159,7 @@ uutils = {}
 #webrender = {}
 #winit = {}
 #xz = {}
-zerod = {}
+#zerod = {}
 #zlib = {}
 
 # User settings
@@ -177,9 +177,6 @@ password = ""
 [[files]]
 path = "/etc/init.d/00_base"
 data = """
-nulld
-zerod
-randd
 ipcd
 #logd
 ptyd
diff --git a/config/desktop.toml b/config/desktop.toml
index c82bd72..c9f5546 100644
--- a/config/desktop.toml
+++ b/config/desktop.toml
@@ -90,7 +90,7 @@ netsurf = {}
 netutils = {}
 #newlib = {}
 #newlibtest = {}
-nulld = {}
+#nulld = {}
 #openjazz = {}
 #openssl = {}
 #openttd = {}
@@ -115,7 +115,7 @@ pkgutils = {}
 ptyd = {}
 #python = {}
 #qemu = {}
-randd = {}
+#randd = {}
 #readline = {} # ncurses
 redoxfs = {}
 #redox-ssh = {}
@@ -156,7 +156,7 @@ uutils = {}
 #webrender = {}
 #winit = {}
 #xz = {}
-zerod = {}
+#zerod = {}
 #zlib = {}
 
 # User settings
@@ -174,9 +174,6 @@ password = ""
 [[files]]
 path = "/etc/init.d/00_base"
 data = """
-nulld
-zerod
-randd
 ipcd
 logd
 ptyd
diff --git a/config/minimal.toml b/config/minimal.toml
index 2da1175..f080b37 100644
--- a/config/minimal.toml
+++ b/config/minimal.toml
@@ -90,7 +90,7 @@ logd = {}
 #netutils = {}
 #newlib = {}
 #newlibtest = {}
-nulld = {}
+#nulld = {}
 #openjazz = {}
 #openssl = {}
 #openttd = {}
@@ -115,7 +115,7 @@ nulld = {}
 ptyd = {}
 #python = {}
 #qemu = {}
-randd = {}
+#randd = {}
 #readline = {} # ncurses
 #redoxfs = {}
 #redox-ssh = {}
@@ -156,7 +156,7 @@ randd = {}
 #webrender = {}
 #winit = {}
 #xz = {}
-zerod = {}
+#zerod = {}
 #zlib = {}
 
 # User settings
@@ -174,9 +174,6 @@ password = ""
 [[files]]
 path = "/etc/init.d/00_base"
 data = """
-nulld
-zerod
-randd
 ipcd
 logd
 ptyd
diff --git a/config/server.toml b/config/server.toml
index a15fdcb..da4cf27 100644
--- a/config/server.toml
+++ b/config/server.toml
@@ -90,7 +90,7 @@ netstack = {}
 netutils = {}
 #newlib = {}
 #newlibtest = {}
-nulld = {}
+#nulld = {}
 #openjazz = {}
 #openssl = {}
 #openttd = {}
@@ -115,7 +115,7 @@ pkgutils = {}
 ptyd = {}
 #python = {}
 #qemu = {}
-randd = {}
+#randd = {}
 #readline = {} # ncurses
 redoxfs = {}
 #redox-ssh = {}
@@ -156,7 +156,7 @@ uutils = {}
 #webrender = {}
 #winit = {}
 #xz = {}
-zerod = {}
+#zerod = {}
 #zlib = {}
 
 # User settings
@@ -174,9 +174,6 @@ password = ""
 [[files]]
 path = "/etc/init.d/00_base"
 data = """
-nulld
-zerod
-randd
 ipcd
 logd
 ptyd
diff --git a/initfs.toml b/initfs.toml
index a0a4cc1..d3d98bd 100644
--- a/initfs.toml
+++ b/initfs.toml
@@ -9,13 +9,19 @@ prompt = false
 [packages]
 drivers = {}
 init = {}
+nulld = {}
+randd = {}
 redoxfs = {}
+zerod = {}
 
 [[files]]
 path="/etc/init.rc"
 data="""
 export PATH /bin
 export TMPDIR /tmp
+nulld
+zerod
+randd
 vesad T T G
 stdio display:1
 ps2d us
diff --git a/initfs_coreboot.toml b/initfs_coreboot.toml
index e1441c8..e1c7231 100644
--- a/initfs_coreboot.toml
+++ b/initfs_coreboot.toml
@@ -9,13 +9,19 @@ prompt = false
 [packages]
 drivers = {}
 init = {}
+nulld = {}
+randd = {}
 redoxfs = {}
+zerod = {}
 
 [[files]]
 path="/etc/init.rc"
 data="""
 export PATH /bin
 export TMPDIR /tmp
+nulld
+zerod
+randd
 vesad T T G
 stdio display:1
 ps2d us
diff --git a/initfs_live.toml b/initfs_live.toml
index e1441c8..e1c7231 100644
--- a/initfs_live.toml
+++ b/initfs_live.toml
@@ -9,13 +9,19 @@ prompt = false
 [packages]
 drivers = {}
 init = {}
+nulld = {}
+randd = {}
 redoxfs = {}
+zerod = {}
 
 [[files]]
 path="/etc/init.rc"
 data="""
 export PATH /bin
 export TMPDIR /tmp
+nulld
+zerod
+randd
 vesad T T G
 stdio display:1
 ps2d us