diff --git a/config/aarch64/demo.toml b/config/aarch64/demo.toml index 25e67d3..e820cca 100644 --- a/config/aarch64/demo.toml +++ b/config/aarch64/demo.toml @@ -1,6 +1,6 @@ # Default demo configuration -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -29,9 +29,7 @@ ion = {} ipcd = {} kernel = {} netdb = {} -netstack = {} #netsurf = {} # lots of porting issues -netutils = {} orbdata = {} orbital = {} orbterm = {} @@ -70,14 +68,6 @@ 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 = """ @@ -92,44 +82,10 @@ getty 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.0" - [[files]] path = "/etc/group" data = """ @@ -137,9 +93,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/aarch64/desktop-minimal.toml b/config/aarch64/desktop-minimal.toml index 122255b..9128eed 100644 --- a/config/aarch64/desktop-minimal.toml +++ b/config/aarch64/desktop-minimal.toml @@ -65,10 +65,6 @@ getty 2 getty debug: -J """ -[[files]] -path = "/etc/redox-release" -data = "0.8.0" - [[files]] path = "/etc/group" data = """ @@ -76,9 +72,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/aarch64/desktop.toml b/config/aarch64/desktop.toml index 1ca4502..c446bee 100644 --- a/config/aarch64/desktop.toml +++ b/config/aarch64/desktop.toml @@ -1,6 +1,6 @@ # Default desktop configuration -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -29,9 +29,7 @@ ion = {} ipcd = {} kernel = {} netdb = {} -netstack = {} #netsurf = {} # lots of porting issues -netutils = {} orbdata = {} orbital = {} orbterm = {} @@ -70,14 +68,6 @@ 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 = """ @@ -92,44 +82,10 @@ getty 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.0" - [[files]] path = "/etc/group" data = """ @@ -137,9 +93,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/aarch64/dev.toml b/config/aarch64/dev.toml index 008481b..f2c96c1 100644 --- a/config/aarch64/dev.toml +++ b/config/aarch64/dev.toml @@ -1,6 +1,6 @@ # Configuration for development, includes cargo and rustc -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -30,9 +30,7 @@ ion = {} ipcd = {} kernel = {} netdb = {} -netstack = {} netsurf = {} -netutils = {} orbdata = {} orbital = {} orbterm = {} @@ -91,14 +89,6 @@ 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 = """ @@ -113,44 +103,10 @@ getty 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.0" - [[files]] path = "/etc/group" data = """ @@ -158,9 +114,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/aarch64/jeremy.toml b/config/aarch64/jeremy.toml index f9189d9..e595d45 100644 --- a/config/aarch64/jeremy.toml +++ b/config/aarch64/jeremy.toml @@ -1,6 +1,6 @@ # Default desktop configuration -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -29,9 +29,7 @@ ion = {} ipcd = {} kernel = {} netdb = {} -netstack = {} #netsurf = {} # lots of porting issues -netutils = {} orbdata = {} orbital = {} orbterm = {} @@ -66,14 +64,6 @@ 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 = """ @@ -88,44 +78,10 @@ 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.0" - [[files]] path = "/etc/group" data = """ @@ -133,9 +89,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/aarch64/raspi3bp/server-minimal.toml b/config/aarch64/raspi3bp/server-minimal.toml index 7920a51..5e88699 100644 --- a/config/aarch64/raspi3bp/server-minimal.toml +++ b/config/aarch64/raspi3bp/server-minimal.toml @@ -53,10 +53,6 @@ getty 2 getty debug: -J """ -[[files]] -path = "/etc/redox-release" -data = "0.8.0" - [[files]] path = "/etc/group" data = """ @@ -64,9 +60,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/aarch64/resist.toml b/config/aarch64/resist.toml index 44a35ee..42e3b72 100644 --- a/config/aarch64/resist.toml +++ b/config/aarch64/resist.toml @@ -1,6 +1,6 @@ # Configuration for using resist -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -27,8 +27,6 @@ initfs = {} ipcd = {} kernel = {} netdb = {} -netstack = {} -netutils = {} ptyd = {} resist = {} userutils = {} @@ -55,6 +53,7 @@ pcid /etc/pcid.d/ escalated """ +# Override to not background dhcpd [[files]] path = "/etc/init.d/10_net" data = """ @@ -73,44 +72,10 @@ resist /share/resist/posix/shell.toml shutdown """ -[[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.0" - [[files]] path = "/etc/group" data = """ @@ -118,9 +83,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/aarch64/server-minimal.toml b/config/aarch64/server-minimal.toml index ff14421..0a91f02 100644 --- a/config/aarch64/server-minimal.toml +++ b/config/aarch64/server-minimal.toml @@ -52,10 +52,6 @@ getty 2 getty debug: -J """ -[[files]] -path = "/etc/redox-release" -data = "0.8.0" - [[files]] path = "/etc/group" data = """ @@ -63,9 +59,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/aarch64/server.toml b/config/aarch64/server.toml index 790d1a7..6011d2a 100644 --- a/config/aarch64/server.toml +++ b/config/aarch64/server.toml @@ -1,6 +1,6 @@ # Default server configuration -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -31,8 +31,6 @@ ion = {} ipcd = {} kernel = {} netdb = {} -netstack = {} -netutils = {} # FIXME: failed to build # pkgutils = {} ptyd = {} @@ -67,14 +65,6 @@ 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 = """ @@ -83,44 +73,10 @@ getty 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.0" - [[files]] path = "/etc/group" data = """ @@ -128,9 +84,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/base.toml b/config/base.toml index 8b6bffb..fe5ff5f 100644 --- a/config/base.toml +++ b/config/base.toml @@ -8,6 +8,18 @@ # Do not prompt if settings are not defined prompt = false +## Configuration files +[[files]] +path = "/etc/hostname" +data = """ +redox +""" + +[[files]] +path = "/etc/redox-release" +data = "0.8.0" + +## Symlinks for usrmerge [[files]] path = "/usr/bin" data = "../bin" @@ -28,6 +40,7 @@ path = "/usr/share" data = "../share" symlink = true +## /tmp directory with special mode [[files]] path = "/tmp" data = "" @@ -35,6 +48,7 @@ directory = true # 0o1777 mode = 1023 +## Device file symlinks [[files]] path = "/dev/null" data = "null:" diff --git a/config/i686/demo.toml b/config/i686/demo.toml index 39f9892..e5a5452 100644 --- a/config/i686/demo.toml +++ b/config/i686/demo.toml @@ -22,7 +22,7 @@ # # ############################################################################## -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -52,9 +52,7 @@ ion = {} ipcd = {} kernel = {} netdb = {} -netstack = {} netsurf = {} -netutils = {} orbdata = {} orbital = {} orbterm = {} @@ -105,14 +103,6 @@ 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 = """ @@ -127,44 +117,10 @@ getty 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.0" - [[files]] path = "/etc/group" data = """ @@ -173,12 +129,6 @@ user;1000;user sudo;1;user """ -[[files]] -path = "/etc/hostname" -data = """ -redox -""" - [[files]] path = "/home/user/Welcome.txt" data = """ diff --git a/config/i686/desktop-minimal.toml b/config/i686/desktop-minimal.toml index 122255b..9128eed 100644 --- a/config/i686/desktop-minimal.toml +++ b/config/i686/desktop-minimal.toml @@ -65,10 +65,6 @@ getty 2 getty debug: -J """ -[[files]] -path = "/etc/redox-release" -data = "0.8.0" - [[files]] path = "/etc/group" data = """ @@ -76,9 +72,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/i686/desktop.toml b/config/i686/desktop.toml index a1a4bcb..24fc97c 100644 --- a/config/i686/desktop.toml +++ b/config/i686/desktop.toml @@ -1,6 +1,6 @@ # Default desktop configuration -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -30,9 +30,7 @@ ion = {} ipcd = {} kernel = {} netdb = {} -netstack = {} netsurf = {} -netutils = {} orbdata = {} orbital = {} orbterm = {} @@ -71,14 +69,6 @@ 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 = """ @@ -93,44 +83,10 @@ getty 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.0" - [[files]] path = "/etc/group" data = """ @@ -138,9 +94,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/i686/dev.toml b/config/i686/dev.toml index 008481b..f2c96c1 100644 --- a/config/i686/dev.toml +++ b/config/i686/dev.toml @@ -1,6 +1,6 @@ # Configuration for development, includes cargo and rustc -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -30,9 +30,7 @@ ion = {} ipcd = {} kernel = {} netdb = {} -netstack = {} netsurf = {} -netutils = {} orbdata = {} orbital = {} orbterm = {} @@ -91,14 +89,6 @@ 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 = """ @@ -113,44 +103,10 @@ getty 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.0" - [[files]] path = "/etc/group" data = """ @@ -158,9 +114,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/i686/jeremy.toml b/config/i686/jeremy.toml index f43db12..3c352da 100644 --- a/config/i686/jeremy.toml +++ b/config/i686/jeremy.toml @@ -1,6 +1,6 @@ # Jeremy's configuration -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -30,9 +30,7 @@ ion = {} ipcd = {} kernel = {} netdb = {} -netstack = {} netsurf = {} -netutils = {} orbdata = {} orbital = {} orbterm = {} @@ -98,14 +96,6 @@ 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 = """ @@ -120,44 +110,10 @@ getty 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.0" - [[files]] path = "/etc/group" data = """ @@ -166,12 +122,6 @@ user;1000;user sudo;1;user """ -[[files]] -path = "/etc/hostname" -data = """ -redox -""" - [[files]] path = "/home/user/Welcome.txt" data = """ diff --git a/config/i686/resist.toml b/config/i686/resist.toml index 44a35ee..42e3b72 100644 --- a/config/i686/resist.toml +++ b/config/i686/resist.toml @@ -1,6 +1,6 @@ # Configuration for using resist -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -27,8 +27,6 @@ initfs = {} ipcd = {} kernel = {} netdb = {} -netstack = {} -netutils = {} ptyd = {} resist = {} userutils = {} @@ -55,6 +53,7 @@ pcid /etc/pcid.d/ escalated """ +# Override to not background dhcpd [[files]] path = "/etc/init.d/10_net" data = """ @@ -73,44 +72,10 @@ resist /share/resist/posix/shell.toml shutdown """ -[[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.0" - [[files]] path = "/etc/group" data = """ @@ -118,9 +83,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/i686/server-minimal.toml b/config/i686/server-minimal.toml index ff14421..0a91f02 100644 --- a/config/i686/server-minimal.toml +++ b/config/i686/server-minimal.toml @@ -52,10 +52,6 @@ getty 2 getty debug: -J """ -[[files]] -path = "/etc/redox-release" -data = "0.8.0" - [[files]] path = "/etc/group" data = """ @@ -63,9 +59,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/i686/server.toml b/config/i686/server.toml index 47b3cca..bd152a3 100644 --- a/config/i686/server.toml +++ b/config/i686/server.toml @@ -1,6 +1,6 @@ # Default server configuration -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -28,8 +28,6 @@ ion = {} ipcd = {} kernel = {} netdb = {} -netstack = {} -netutils = {} pkgutils = {} ptyd = {} redoxfs = {} @@ -63,14 +61,6 @@ 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 = """ @@ -79,44 +69,10 @@ getty 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.0" - [[files]] path = "/etc/group" data = """ @@ -124,9 +80,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/net.toml b/config/net.toml new file mode 100644 index 0000000..0711303 --- /dev/null +++ b/config/net.toml @@ -0,0 +1,54 @@ +# Net configuration: includes the base configuration and adds files required +# for networking + +include = ["base.toml"] + +# General settings +[general] +# Do not prompt if settings are not defined +prompt = false + +## Network packages +[packages] +netstack = {} +netutils = {} + +## Network init +[[files]] +path = "/etc/init.d/10_net" +data = """ +smolnetd +dnsd +dhcpd -b +""" + +## Default net configuration (optimized for QEMU) +[[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 +""" diff --git a/config/x86_64/demo.toml b/config/x86_64/demo.toml index c7a5bd0..ac55ac8 100644 --- a/config/x86_64/demo.toml +++ b/config/x86_64/demo.toml @@ -22,7 +22,7 @@ # # ############################################################################## -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -55,9 +55,7 @@ ion = {} ipcd = {} kernel = {} netdb = {} -netstack = {} netsurf = {} -netutils = {} orbdata = {} orbital = {} orbterm = {} @@ -126,14 +124,6 @@ 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 = """ @@ -148,44 +138,10 @@ getty 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.0" - [[files]] path = "/etc/group" data = """ @@ -194,12 +150,6 @@ user;1000;user sudo;1;user """ -[[files]] -path = "/etc/hostname" -data = """ -redox -""" - [[files]] path = "/home/user/Welcome.txt" data = """ diff --git a/config/x86_64/desktop-contain.toml b/config/x86_64/desktop-contain.toml index d8112a1..115cfa0 100644 --- a/config/x86_64/desktop-contain.toml +++ b/config/x86_64/desktop-contain.toml @@ -1,6 +1,6 @@ # Default desktop configuration -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -30,9 +30,7 @@ ion = {} ipcd = {} kernel = {} netdb = {} -netstack = {} netsurf = {} -netutils = {} orbdata = {} orbital = {} orbterm = {} @@ -71,14 +69,6 @@ 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 = """ @@ -93,44 +83,10 @@ getty 2 getty --contain 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.0" - [[files]] path = "/etc/group" data = """ @@ -139,12 +95,6 @@ user;1000;user sudo;1;user """ -[[files]] -path = "/etc/hostname" -data = """ -redox -""" - [[files]] path = "/etc/contain.toml" data = """ diff --git a/config/x86_64/desktop-minimal.toml b/config/x86_64/desktop-minimal.toml index 122255b..9128eed 100644 --- a/config/x86_64/desktop-minimal.toml +++ b/config/x86_64/desktop-minimal.toml @@ -65,10 +65,6 @@ getty 2 getty debug: -J """ -[[files]] -path = "/etc/redox-release" -data = "0.8.0" - [[files]] path = "/etc/group" data = """ @@ -76,9 +72,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/x86_64/desktop.toml b/config/x86_64/desktop.toml index a1a4bcb..24fc97c 100644 --- a/config/x86_64/desktop.toml +++ b/config/x86_64/desktop.toml @@ -1,6 +1,6 @@ # Default desktop configuration -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -30,9 +30,7 @@ ion = {} ipcd = {} kernel = {} netdb = {} -netstack = {} netsurf = {} -netutils = {} orbdata = {} orbital = {} orbterm = {} @@ -71,14 +69,6 @@ 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 = """ @@ -93,44 +83,10 @@ getty 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.0" - [[files]] path = "/etc/group" data = """ @@ -138,9 +94,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/x86_64/dev.toml b/config/x86_64/dev.toml index 008481b..f2c96c1 100644 --- a/config/x86_64/dev.toml +++ b/config/x86_64/dev.toml @@ -1,6 +1,6 @@ # Configuration for development, includes cargo and rustc -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -30,9 +30,7 @@ ion = {} ipcd = {} kernel = {} netdb = {} -netstack = {} netsurf = {} -netutils = {} orbdata = {} orbital = {} orbterm = {} @@ -91,14 +89,6 @@ 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 = """ @@ -113,44 +103,10 @@ getty 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.0" - [[files]] path = "/etc/group" data = """ @@ -158,9 +114,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/x86_64/jeremy.toml b/config/x86_64/jeremy.toml index 1c0199b..ed157f1 100644 --- a/config/x86_64/jeremy.toml +++ b/config/x86_64/jeremy.toml @@ -1,6 +1,6 @@ # Jeremy's configuration -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -30,9 +30,7 @@ ion = {} ipcd = {} kernel = {} netdb = {} -netstack = {} netsurf = {} -netutils = {} orbdata = {} orbital = {} orbterm = {} @@ -49,6 +47,8 @@ uutils = {} # apps cosmic-edit = {} +cosmic-files = {} +cosmic-term = {} cosmic-text = {} periodictable = {} pixelcannon = {} @@ -63,6 +63,7 @@ ffmpeg6 = {} git = {} gnu-grep = {} lua54 = {} +nano = {} perg = {} ripgrep = {} rustpython = {} @@ -97,13 +98,13 @@ winit = {} autoconf = {} automake = {} #cargo = {} # openssl issues -gcc13 = {} +#gcc13 = {} # libiberty errors gnu-binutils = {} gnu-make = {} nasm = {} patch = {} pkg-config = {} -rust = {} +#rust = {} # takes too long to compile rustpython = {} # games @@ -171,14 +172,6 @@ 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 = """ @@ -193,44 +186,10 @@ getty 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.0" - [[files]] path = "/etc/group" data = """ @@ -238,9 +197,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/x86_64/resist.toml b/config/x86_64/resist.toml index 44a35ee..42e3b72 100644 --- a/config/x86_64/resist.toml +++ b/config/x86_64/resist.toml @@ -1,6 +1,6 @@ # Configuration for using resist -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -27,8 +27,6 @@ initfs = {} ipcd = {} kernel = {} netdb = {} -netstack = {} -netutils = {} ptyd = {} resist = {} userutils = {} @@ -55,6 +53,7 @@ pcid /etc/pcid.d/ escalated """ +# Override to not background dhcpd [[files]] path = "/etc/init.d/10_net" data = """ @@ -73,44 +72,10 @@ resist /share/resist/posix/shell.toml shutdown """ -[[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.0" - [[files]] path = "/etc/group" data = """ @@ -118,9 +83,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/x86_64/server-minimal.toml b/config/x86_64/server-minimal.toml index ff14421..0a91f02 100644 --- a/config/x86_64/server-minimal.toml +++ b/config/x86_64/server-minimal.toml @@ -52,10 +52,6 @@ getty 2 getty debug: -J """ -[[files]] -path = "/etc/redox-release" -data = "0.8.0" - [[files]] path = "/etc/group" data = """ @@ -63,9 +59,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -""" diff --git a/config/x86_64/server.toml b/config/x86_64/server.toml index 47b3cca..bd152a3 100644 --- a/config/x86_64/server.toml +++ b/config/x86_64/server.toml @@ -1,6 +1,6 @@ # Default server configuration -include = ["../base.toml"] +include = ["../net.toml"] # General settings [general] @@ -28,8 +28,6 @@ ion = {} ipcd = {} kernel = {} netdb = {} -netstack = {} -netutils = {} pkgutils = {} ptyd = {} redoxfs = {} @@ -63,14 +61,6 @@ 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 = """ @@ -79,44 +69,10 @@ getty 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.0" - [[files]] path = "/etc/group" data = """ @@ -124,9 +80,3 @@ root;0;root user;1000;user sudo;1;user """ - -[[files]] -path = "/etc/hostname" -data = """ -redox -"""