From 8257241d7e8bc94d7802eba4b66499a2499bfb03 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 19 Sep 2024 20:48:43 -0600
Subject: [PATCH] Update configs

---
 res/base.toml | 78 ++++++++++++++++++++++++++++---------------------
 res/gui.toml  | 80 ++++++++++++++++++++++++++++++---------------------
 2 files changed, 92 insertions(+), 66 deletions(-)

diff --git a/res/base.toml b/res/base.toml
index 0efb8fc..9dae755 100644
--- a/res/base.toml
+++ b/res/base.toml
@@ -7,6 +7,8 @@ prompt = false
 
 [packages.bash]
 
+[packages.bootloader]
+
 [packages.bootstrap]
 
 [packages.ca-certificates]
@@ -27,6 +29,8 @@ prompt = false
 
 [packages.initfs]
 
+[packages.ion]
+
 [packages.ipcd]
 
 [packages.kernel]
@@ -62,6 +66,15 @@ symlink = false
 directory = false
 recursive_chown = false
 
+[[files]]
+path = "/usr/lib/init.d/00_drivers"
+data = """
+pcid /etc/pcid.d/
+"""
+symlink = false
+directory = false
+recursive_chown = false
+
 [[files]]
 path = "/etc/hostname"
 data = """
@@ -73,17 +86,17 @@ recursive_chown = false
 
 [[files]]
 path = "/usr/lib/os-release"
-data = """
-PRETTY_NAME=\"Redox OS 0.8.0\"
-NAME=\"Redox OS\"
-VERSION_ID=\"0.8.0\"
-VERSION=\"0.8.0\"
-ID=\"redox-os\"
-
-HOME_URL=\"https://redox-os.org/\"
-DOCUMENTATION_URL=\"https://redox-os.org/docs/\"
-SUPPORT_URL=\"https://redox-os.org/community/\"
-"""
+data = '''
+PRETTY_NAME="Redox OS 0.9.0"
+NAME="Redox OS"
+VERSION_ID="0.9.0"
+VERSION="0.9.0"
+ID="redox-os"
+
+HOME_URL="https://redox-os.org/"
+DOCUMENTATION_URL="https://redox-os.org/docs/"
+SUPPORT_URL="https://redox-os.org/community/"
+'''
 symlink = false
 directory = false
 recursive_chown = false
@@ -148,6 +161,21 @@ symlink = true
 directory = false
 recursive_chown = false
 
+[[files]]
+path = "/usr/libexec"
+data = ""
+symlink = false
+directory = true
+mode = 493
+recursive_chown = false
+
+[[files]]
+path = "/libexec"
+data = "usr/libexec"
+symlink = true
+directory = false
+recursive_chown = false
+
 [[files]]
 path = "/usr/share"
 data = ""
@@ -165,28 +193,28 @@ recursive_chown = false
 
 [[files]]
 path = "/dev/null"
-data = "null:"
+data = "/scheme/null"
 symlink = true
 directory = false
 recursive_chown = false
 
 [[files]]
 path = "/dev/random"
-data = "rand:"
+data = "/scheme/rand"
 symlink = true
 directory = false
 recursive_chown = false
 
 [[files]]
 path = "/dev/urandom"
-data = "rand:"
+data = "/scheme/rand"
 symlink = true
 directory = false
 recursive_chown = false
 
 [[files]]
 path = "/dev/zero"
-data = "zero:"
+data = "/scheme/zero"
 symlink = true
 directory = false
 recursive_chown = false
@@ -219,15 +247,6 @@ symlink = true
 directory = false
 recursive_chown = false
 
-[[files]]
-path = "/usr/lib/init.d/00_drivers"
-data = """
-pcid /etc/pcid.d/
-"""
-symlink = false
-directory = false
-recursive_chown = false
-
 [[files]]
 path = "/usr/lib/init.d/10_net"
 data = """
@@ -275,15 +294,6 @@ symlink = false
 directory = false
 recursive_chown = false
 
-[[files]]
-path = "/etc/net/mac"
-data = """
-54-52-00-ab-cd-ef
-"""
-symlink = false
-directory = false
-recursive_chown = false
-
 [[files]]
 path = "/usr/lib/init.d/10_net"
 data = """
@@ -337,9 +347,11 @@ uid = 0
 gid = 0
 name = "root"
 home = "/root"
+shell = "/usr/bin/ion"
 
 [users.user]
 password = ""
+shell = "/usr/bin/ion"
 
 [groups.sudo]
 gid = 1
diff --git a/res/gui.toml b/res/gui.toml
index b8edc31..da5649a 100644
--- a/res/gui.toml
+++ b/res/gui.toml
@@ -7,6 +7,8 @@ prompt = false
 
 [packages.bash]
 
+[packages.bootloader]
+
 [packages.bootstrap]
 
 [packages.ca-certificates]
@@ -27,6 +29,8 @@ prompt = false
 
 [packages.initfs]
 
+[packages.ion]
+
 [packages.ipcd]
 
 [packages.kernel]
@@ -66,6 +70,15 @@ symlink = false
 directory = false
 recursive_chown = false
 
+[[files]]
+path = "/usr/lib/init.d/00_drivers"
+data = """
+pcid /etc/pcid.d/
+"""
+symlink = false
+directory = false
+recursive_chown = false
+
 [[files]]
 path = "/etc/hostname"
 data = """
@@ -77,17 +90,17 @@ recursive_chown = false
 
 [[files]]
 path = "/usr/lib/os-release"
-data = """
-PRETTY_NAME=\"Redox OS 0.8.0\"
-NAME=\"Redox OS\"
-VERSION_ID=\"0.8.0\"
-VERSION=\"0.8.0\"
-ID=\"redox-os\"
-
-HOME_URL=\"https://redox-os.org/\"
-DOCUMENTATION_URL=\"https://redox-os.org/docs/\"
-SUPPORT_URL=\"https://redox-os.org/community/\"
-"""
+data = '''
+PRETTY_NAME="Redox OS 0.9.0"
+NAME="Redox OS"
+VERSION_ID="0.9.0"
+VERSION="0.9.0"
+ID="redox-os"
+
+HOME_URL="https://redox-os.org/"
+DOCUMENTATION_URL="https://redox-os.org/docs/"
+SUPPORT_URL="https://redox-os.org/community/"
+'''
 symlink = false
 directory = false
 recursive_chown = false
@@ -152,6 +165,21 @@ symlink = true
 directory = false
 recursive_chown = false
 
+[[files]]
+path = "/usr/libexec"
+data = ""
+symlink = false
+directory = true
+mode = 493
+recursive_chown = false
+
+[[files]]
+path = "/libexec"
+data = "usr/libexec"
+symlink = true
+directory = false
+recursive_chown = false
+
 [[files]]
 path = "/usr/share"
 data = ""
@@ -169,28 +197,28 @@ recursive_chown = false
 
 [[files]]
 path = "/dev/null"
-data = "null:"
+data = "/scheme/null"
 symlink = true
 directory = false
 recursive_chown = false
 
 [[files]]
 path = "/dev/random"
-data = "rand:"
+data = "/scheme/rand"
 symlink = true
 directory = false
 recursive_chown = false
 
 [[files]]
 path = "/dev/urandom"
-data = "rand:"
+data = "/scheme/rand"
 symlink = true
 directory = false
 recursive_chown = false
 
 [[files]]
 path = "/dev/zero"
-data = "zero:"
+data = "/scheme/zero"
 symlink = true
 directory = false
 recursive_chown = false
@@ -223,15 +251,6 @@ symlink = true
 directory = false
 recursive_chown = false
 
-[[files]]
-path = "/usr/lib/init.d/00_drivers"
-data = """
-pcid /etc/pcid.d/
-"""
-symlink = false
-directory = false
-recursive_chown = false
-
 [[files]]
 path = "/usr/lib/init.d/10_net"
 data = """
@@ -279,15 +298,6 @@ symlink = false
 directory = false
 recursive_chown = false
 
-[[files]]
-path = "/etc/net/mac"
-data = """
-54-52-00-ab-cd-ef
-"""
-symlink = false
-directory = false
-recursive_chown = false
-
 [[files]]
 path = "/usr/lib/init.d/10_net"
 data = """
@@ -340,7 +350,9 @@ path = "/usr/lib/init.d/30_redoxer"
 data = """
 echo
 echo ## running redoxer in orbital ##
+export VT 3
 orbital redoxerd
+unset VT
 """
 symlink = false
 directory = false
@@ -352,9 +364,11 @@ uid = 0
 gid = 0
 name = "root"
 home = "/root"
+shell = "/usr/bin/ion"
 
 [users.user]
 password = ""
+shell = "/usr/bin/ion"
 
 [groups.sudo]
 gid = 1
-- 
GitLab