From 9c4f0756eceb68c421a0d9bf0a35dedf5060cb79 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Fri, 11 Nov 2022 12:11:23 -0700
Subject: [PATCH] Add images configs for i686

---
 config/i686/ci.toml       |   2 +
 config/i686/demo.toml     | 241 ++++++++++++++++++++++++++++++++++++++
 config/i686/server.toml   | 177 ++++++++++++++++++++++++++++
 config/x86_64/server.toml |   3 +-
 4 files changed, 421 insertions(+), 2 deletions(-)
 create mode 100644 config/i686/demo.toml
 create mode 100644 config/i686/server.toml

diff --git a/config/i686/ci.toml b/config/i686/ci.toml
index 68fa02f..d9a51b4 100644
--- a/config/i686/ci.toml
+++ b/config/i686/ci.toml
@@ -40,3 +40,5 @@ resist = {}
 smith = {}
 userutils = {}
 uutils = {}
+
+#TODO: Add more packages
diff --git a/config/i686/demo.toml b/config/i686/demo.toml
new file mode 100644
index 0000000..f557e58
--- /dev/null
+++ b/config/i686/demo.toml
@@ -0,0 +1,241 @@
+##############################################################################
+#                          Redox Demo Configuration                          #
+#                                                                            #
+# This file defines the setup of the Redox Demo system.                      #
+#                                                                            #
+# The "[packages]" section specifies what packages are installed in the      #
+# filesystem prior to booting the system. During build, these packages must  #
+# have a recipe defined in the config folder (see the Redox Book,            #
+# Chapter 5.1). The first group of packages is mandatory for the system to   #
+# function, although some items can be removed for special builds,           #
+# e.g. The Orbital GUI is not required for a headless server.                #
+#                                                                            #
+# Items in the "Developer Tools" and "Games" section are optional. You can   #
+# add your own programs here.                                                #
+#                                                                            #
+# The "[users]" section creates user id's and passwords. Each user will have #
+# a home directory at boot.                                                  #
+#                                                                            #
+# The "[[files]]" section contains files needed by the system. If you need   #
+# create a file, e.g. a config file for a program you are adding, you can do #
+# it here.                                                                   #
+#                                                                            #
+##############################################################################
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 512
+# Do not prompt if settings are not defined
+prompt = false
+
+# Package settings
+[packages]
+audiod = {}
+bootloader = {}
+bootstrap = {}
+ca-certificates = {}
+contain = {}
+coreutils = {}
+#dash = {} # relibc issues?
+diffutils = {}
+drivers = {}
+escalated = {}
+extrautils = {}
+findutils = {}
+initfs = {}
+installer = {}
+ion = {}
+ipcd = {}
+kernel = {}
+netdb = {}
+netstack = {}
+#netsurf = {} # openssl issues
+netutils = {}
+orbdata = {}
+orbital = {}
+orbterm = {}
+orbutils = {}
+pkgutils = {}
+ptyd = {}
+redoxfs = {}
+relibc = {}
+resist = {}
+smith = {}
+userutils = {}
+uutils = {}
+
+#TODO: Add demos
+
+# User settings
+[users.root]
+password = "password"
+uid = 0
+gid = 0
+name = "root"
+home = "/root"
+
+[users.user]
+# Password is unset
+password = ""
+
+[[files]]
+path = "/etc/init.d/00_base"
+data = """
+ipcd
+ptyd
+pcid /etc/pcid.d/
+escalated
+"""
+
+[[files]]
+path = "/etc/init.d/10_net"
+data = """
+smolnetd
+dnsd
+dhcpd -b
+"""
+
+[[files]]
+path = "/etc/init.d/20_orbital"
+data = """
+audiod
+orbital display:3/activate orblogin launcher
+"""
+
+[[files]]
+path = "/etc/init.d/30_console"
+data = """
+getty display:2
+getty debug: -J
+"""
+
+[[files]]
+path = "/etc/net/dns"
+data = """
+208.67.222.222
+"""
+
+[[files]]
+path = "/etc/net/ip"
+data = """
+10.0.2.15
+"""
+
+[[files]]
+path = "/etc/net/ip_router"
+data = """
+10.0.2.2
+"""
+
+[[files]]
+path = "/etc/net/ip_subnet"
+data = """
+255.255.255.0
+"""
+
+[[files]]
+path = "/etc/net/mac"
+data = """
+54-52-00-ab-cd-ef
+"""
+
+[[files]]
+path = "/etc/pkg.d/50_redox"
+data = "https://static.redox-os.org/pkg"
+
+[[files]]
+path = "/etc/redox-release"
+data = "0.8.0alpha"
+
+[[files]]
+path = "/etc/group"
+data = """
+root;0;root
+user;1000;user
+sudo;1;user
+"""
+
+[[files]]
+path = "/etc/hostname"
+data = """
+redox
+"""
+
+[[files]]
+path = "/usr/bin"
+data = "../bin"
+symlink = true
+
+[[files]]
+path = "/usr/games"
+data = "../games"
+symlink = true
+
+[[files]]
+path = "/usr/include"
+data = "../include"
+symlink = true
+
+[[files]]
+path = "/usr/lib"
+data = "../lib"
+symlink = true
+
+[[files]]
+path = "/usr/share"
+data = "../share"
+symlink = true
+
+[[files]]
+path = "/tmp"
+data = ""
+directory= true
+# 0o1777
+mode = 1023
+
+[[files]]
+path = "/dev/null"
+data = "null:"
+symlink = true
+
+[[files]]
+path = "/dev/random"
+data = "rand:"
+symlink = true
+
+[[files]]
+path = "/dev/urandom"
+data = "rand:"
+symlink = true
+
+[[files]]
+path = "/dev/zero"
+data = "zero:"
+symlink = true
+
+[[files]]
+path = "/home/user/Welcome.txt"
+data = """
+##############################################################################
+#                                                                            #
+#                             Welcome to Redox!                              #
+#                                                                            #
+# Redox is an operating system written in Rust, a language with focus        #
+# on safety and high performance. Redox, following the microkernel design,   #
+# aims to be secure, usable, and free. Redox is inspired by previous kernels #
+# and operating systems, such as SeL4, MINIX, Plan 9, and BSD.               #
+#                                                                            #
+# Redox _is not_ just a kernel, it's a full-featured Operating System,       #
+# providing packages (memory allocator, file system, display manager, core   #
+# utilities, etc.) that together make up a functional and convenient         #
+# operating system. You can loosely think of it as the GNU or BSD ecosystem, #
+# but in a memory safe language and with modern technology.                  #
+#                                                                            #
+# The website can be found at https://www.redox-os.org.                      #
+#                                                                            #
+# For things to try on Redox, please see                                     #
+# https://doc.redox-os.org/book/ch02-06-trying-out-redox.html                #
+#                                                                            #
+##############################################################################
+"""
diff --git a/config/i686/server.toml b/config/i686/server.toml
new file mode 100644
index 0000000..7d90828
--- /dev/null
+++ b/config/i686/server.toml
@@ -0,0 +1,177 @@
+# Default server configuration
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 256
+# Do not prompt if settings are not defined
+prompt = false
+
+# Package settings
+[packages]
+bootloader = {}
+bootstrap = {}
+ca-certificates = {}
+contain = {}
+coreutils = {}
+#dash = {} # relibc issues?
+diffutils = {}
+drivers = {}
+escalated = {}
+extrautils = {}
+findutils = {}
+initfs = {}
+installer = {}
+ion = {}
+ipcd = {}
+kernel = {}
+netdb = {}
+netstack = {}
+netutils = {}
+pkgutils = {}
+ptyd = {}
+redoxfs = {}
+resist = {}
+smith = {}
+userutils = {}
+uutils = {}
+
+# User settings
+[users.root]
+password = "password"
+uid = 0
+gid = 0
+name = "root"
+home = "/root"
+
+[users.user]
+# Password is unset
+password = ""
+
+[[files]]
+path = "/etc/init.d/00_base"
+data = """
+ipcd
+ptyd
+pcid /etc/pcid.d/
+escalated
+"""
+
+[[files]]
+path = "/etc/init.d/10_net"
+data = """
+smolnetd
+dnsd
+dhcpd -b
+"""
+
+[[files]]
+path = "/etc/init.d/30_console"
+data = """
+getty display:2/activate
+getty debug: -J
+"""
+
+[[files]]
+path = "/etc/net/dns"
+data = """
+208.67.222.222
+"""
+
+[[files]]
+path = "/etc/net/ip"
+data = """
+10.0.2.15
+"""
+
+[[files]]
+path = "/etc/net/ip_router"
+data = """
+10.0.2.2
+"""
+
+[[files]]
+path = "/etc/net/ip_subnet"
+data = """
+255.255.255.0
+"""
+
+[[files]]
+path = "/etc/net/mac"
+data = """
+54-52-00-ab-cd-ef
+"""
+
+[[files]]
+path = "/etc/pkg.d/50_redox"
+data = "https://static.redox-os.org/pkg"
+
+[[files]]
+path = "/etc/redox-release"
+data = "0.8.0alpha"
+
+[[files]]
+path = "/etc/group"
+data = """
+root;0;root
+user;1000;user
+sudo;1;user
+"""
+
+[[files]]
+path = "/etc/hostname"
+data = """
+redox
+"""
+
+[[files]]
+path = "/usr/bin"
+data = "../bin"
+symlink = true
+
+[[files]]
+path = "/usr/games"
+data = "../games"
+symlink = true
+
+[[files]]
+path = "/usr/include"
+data = "../include"
+symlink = true
+
+[[files]]
+path = "/usr/lib"
+data = "../lib"
+symlink = true
+
+[[files]]
+path = "/usr/share"
+data = "../share"
+symlink = true
+
+[[files]]
+path = "/tmp"
+data = ""
+directory= true
+# 0o1777
+mode = 1023
+
+[[files]]
+path = "/dev/null"
+data = "null:"
+symlink = true
+
+[[files]]
+path = "/dev/random"
+data = "rand:"
+symlink = true
+
+[[files]]
+path = "/dev/urandom"
+data = "rand:"
+symlink = true
+
+[[files]]
+path = "/dev/zero"
+data = "zero:"
+symlink = true
diff --git a/config/x86_64/server.toml b/config/x86_64/server.toml
index b8b471f..0453a24 100644
--- a/config/x86_64/server.toml
+++ b/config/x86_64/server.toml
@@ -20,10 +20,9 @@ drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
-gnu-make = {}
+initfs = {}
 installer = {}
 ion = {}
-initfs = {}
 ipcd = {}
 kernel = {}
 netdb = {}