From 8f51fda66e4686aad2aef355740b4e205c67d756 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 4 Jan 2024 13:27:25 -0700 Subject: [PATCH] Move some init into net.toml --- config/aarch64/demo.toml | 13 ------------- config/aarch64/desktop.toml | 13 ------------- config/aarch64/dev.toml | 12 ------------ config/aarch64/jeremy.toml | 13 ------------- config/aarch64/server.toml | 15 --------------- config/i686/demo.toml | 13 ------------- config/i686/desktop.toml | 13 ------------- config/i686/dev.toml | 13 ------------- config/i686/jeremy.toml | 13 ------------- config/i686/server.toml | 13 ------------- config/net.toml | 10 +++++++++- config/resist.toml | 7 ------- config/x86_64/demo.toml | 13 ------------- config/x86_64/desktop-contain.toml | 13 ------------- config/x86_64/desktop.toml | 13 ------------- config/x86_64/dev.toml | 13 ------------- config/x86_64/jeremy.toml | 13 ------------- config/x86_64/server.toml | 13 ------------- 18 files changed, 9 insertions(+), 217 deletions(-) diff --git a/config/aarch64/demo.toml b/config/aarch64/demo.toml index 3946926..07a0e30 100644 --- a/config/aarch64/demo.toml +++ b/config/aarch64/demo.toml @@ -18,13 +18,10 @@ ca-certificates = {} contain = {} coreutils = {} diffutils = {} -#drivers = {} # more porting work -#escalated = {} # porting extrautils = {} findutils = {} #installer = {} # failure to build ring ion = {} -ipcd = {} netdb = {} #netsurf = {} # lots of porting issues orbdata = {} @@ -32,7 +29,6 @@ orbital = {} orbterm = {} orbutils = {} #pkgutils = {} # failure to build ring -ptyd = {} redoxfs = {} relibc = {} resist = {} @@ -44,15 +40,6 @@ git = {} curl = {} vim = {} -[[files]] -path = "/etc/init.d/00_base" -data = """ -ipcd -ptyd -pcid /etc/pcid.d/ -escalated -""" - [[files]] path = "/etc/init.d/20_orbital" data = """ diff --git a/config/aarch64/desktop.toml b/config/aarch64/desktop.toml index fbbc834..0e4c999 100644 --- a/config/aarch64/desktop.toml +++ b/config/aarch64/desktop.toml @@ -18,13 +18,10 @@ ca-certificates = {} contain = {} coreutils = {} diffutils = {} -#drivers = {} # more porting work -#escalated = {} # porting extrautils = {} findutils = {} #installer = {} # failure to build ring ion = {} -ipcd = {} netdb = {} #netsurf = {} # lots of porting issues orbdata = {} @@ -32,7 +29,6 @@ orbital = {} orbterm = {} orbutils = {} #pkgutils = {} # failure to build ring -ptyd = {} redoxfs = {} relibc = {} resist = {} @@ -44,15 +40,6 @@ git = {} curl = {} vim = {} -[[files]] -path = "/etc/init.d/00_base" -data = """ -ipcd -ptyd -pcid /etc/pcid.d/ -escalated -""" - [[files]] path = "/etc/init.d/20_orbital" data = """ diff --git a/config/aarch64/dev.toml b/config/aarch64/dev.toml index 691b59b..604a356 100644 --- a/config/aarch64/dev.toml +++ b/config/aarch64/dev.toml @@ -19,13 +19,11 @@ contain = {} coreutils = {} diffutils = {} drivers = {} -escalated = {} extrautils = {} findutils = {} installer = {} installer-gui = {} ion = {} -ipcd = {} netdb = {} netsurf = {} orbdata = {} @@ -33,7 +31,6 @@ orbital = {} orbterm = {} orbutils = {} pkgutils = {} -ptyd = {} redoxfs = {} relibc = {} resist = {} @@ -65,15 +62,6 @@ fn main() { } """ -[[files]] -path = "/etc/init.d/00_base" -data = """ -ipcd -ptyd -pcid /etc/pcid.d/ -escalated -""" - [[files]] path = "/etc/init.d/20_orbital" data = """ diff --git a/config/aarch64/jeremy.toml b/config/aarch64/jeremy.toml index c11d653..a9cfaae 100644 --- a/config/aarch64/jeremy.toml +++ b/config/aarch64/jeremy.toml @@ -18,13 +18,10 @@ ca-certificates = {} contain = {} coreutils = {} diffutils = {} -#drivers = {} # more porting work -#escalated = {} # porting extrautils = {} findutils = {} #installer = {} # failure to build ring ion = {} -ipcd = {} netdb = {} #netsurf = {} # lots of porting issues orbdata = {} @@ -32,7 +29,6 @@ orbital = {} orbterm = {} orbutils = {} #pkgutils = {} # failure to build ring -ptyd = {} redoxfs = {} relibc = {} resist = {} @@ -40,15 +36,6 @@ smith = {} userutils = {} uutils = {} -[[files]] -path = "/etc/init.d/00_base" -data = """ -ipcd -ptyd -pcid /etc/pcid.d/ -escalated -""" - [[files]] path = "/etc/init.d/20_orbital" data = """ diff --git a/config/aarch64/server.toml b/config/aarch64/server.toml index fb87a58..3e684fb 100644 --- a/config/aarch64/server.toml +++ b/config/aarch64/server.toml @@ -17,20 +17,14 @@ ca-certificates = {} contain = {} coreutils = {} diffutils = {} -# FIXME: failed to build -# drivers = {} -# FIXME: failed to build -# escalated = {} extrautils = {} findutils = {} # FIXME: failed to build # installer = {} ion = {} -ipcd = {} netdb = {} # FIXME: failed to build # pkgutils = {} -ptyd = {} redoxfs = {} resist = {} smith = {} @@ -41,15 +35,6 @@ git = {} curl = {} vim = {} -[[files]] -path = "/etc/init.d/00_base" -data = """ -ipcd -ptyd -pcid /etc/pcid.d/ -escalated -""" - [[files]] path = "/etc/init.d/30_console" data = """ diff --git a/config/i686/demo.toml b/config/i686/demo.toml index a2874b9..a091a15 100644 --- a/config/i686/demo.toml +++ b/config/i686/demo.toml @@ -40,14 +40,11 @@ ca-certificates = {} contain = {} coreutils = {} diffutils = {} -drivers = {} -escalated = {} extrautils = {} findutils = {} installer = {} installer-gui = {} ion = {} -ipcd = {} netdb = {} netsurf = {} orbdata = {} @@ -55,7 +52,6 @@ orbital = {} orbterm = {} orbutils = {} pkgutils = {} -ptyd = {} redoxfs = {} relibc = {} resist = {} @@ -79,15 +75,6 @@ pixelcannon = {} # MIDI freepats = {} -[[files]] -path = "/etc/init.d/00_base" -data = """ -ipcd -ptyd -pcid /etc/pcid.d/ -escalated -""" - [[files]] path = "/etc/init.d/20_orbital" data = """ diff --git a/config/i686/desktop.toml b/config/i686/desktop.toml index ae951c9..9569af6 100644 --- a/config/i686/desktop.toml +++ b/config/i686/desktop.toml @@ -18,14 +18,11 @@ ca-certificates = {} contain = {} coreutils = {} diffutils = {} -drivers = {} -escalated = {} extrautils = {} findutils = {} installer = {} installer-gui = {} ion = {} -ipcd = {} netdb = {} netsurf = {} orbdata = {} @@ -33,7 +30,6 @@ orbital = {} orbterm = {} orbutils = {} pkgutils = {} -ptyd = {} redoxfs = {} relibc = {} resist = {} @@ -45,15 +41,6 @@ git = {} curl = {} vim = {} -[[files]] -path = "/etc/init.d/00_base" -data = """ -ipcd -ptyd -pcid /etc/pcid.d/ -escalated -""" - [[files]] path = "/etc/init.d/20_orbital" data = """ diff --git a/config/i686/dev.toml b/config/i686/dev.toml index 691b59b..cc16080 100644 --- a/config/i686/dev.toml +++ b/config/i686/dev.toml @@ -18,14 +18,11 @@ ca-certificates = {} contain = {} coreutils = {} diffutils = {} -drivers = {} -escalated = {} extrautils = {} findutils = {} installer = {} installer-gui = {} ion = {} -ipcd = {} netdb = {} netsurf = {} orbdata = {} @@ -33,7 +30,6 @@ orbital = {} orbterm = {} orbutils = {} pkgutils = {} -ptyd = {} redoxfs = {} relibc = {} resist = {} @@ -65,15 +61,6 @@ fn main() { } """ -[[files]] -path = "/etc/init.d/00_base" -data = """ -ipcd -ptyd -pcid /etc/pcid.d/ -escalated -""" - [[files]] path = "/etc/init.d/20_orbital" data = """ diff --git a/config/i686/jeremy.toml b/config/i686/jeremy.toml index d630ce8..78d2125 100644 --- a/config/i686/jeremy.toml +++ b/config/i686/jeremy.toml @@ -18,14 +18,11 @@ ca-certificates = {} contain = {} coreutils = {} diffutils = {} -drivers = {} -escalated = {} extrautils = {} findutils = {} installer = {} installer-gui = {} ion = {} -ipcd = {} netdb = {} netsurf = {} orbdata = {} @@ -33,7 +30,6 @@ orbital = {} orbterm = {} orbutils = {} pkgutils = {} -ptyd = {} redoxfs = {} relibc = {} resist = {} @@ -72,15 +68,6 @@ keyboard-sfx = {} terminfo = {} ttf-hack = {} -[[files]] -path = "/etc/init.d/00_base" -data = """ -ipcd -ptyd -pcid /etc/pcid.d/ -escalated -""" - [[files]] path = "/etc/init.d/20_orbital" data = """ diff --git a/config/i686/server.toml b/config/i686/server.toml index fe84ee3..20a8968 100644 --- a/config/i686/server.toml +++ b/config/i686/server.toml @@ -17,16 +17,12 @@ ca-certificates = {} contain = {} coreutils = {} diffutils = {} -drivers = {} -escalated = {} extrautils = {} findutils = {} installer = {} ion = {} -ipcd = {} netdb = {} pkgutils = {} -ptyd = {} redoxfs = {} resist = {} smith = {} @@ -37,15 +33,6 @@ git = {} curl = {} vim = {} -[[files]] -path = "/etc/init.d/00_base" -data = """ -ipcd -ptyd -pcid /etc/pcid.d/ -escalated -""" - [[files]] path = "/etc/init.d/30_console" data = """ diff --git a/config/net.toml b/config/net.toml index d785d06..b20932a 100644 --- a/config/net.toml +++ b/config/net.toml @@ -3,11 +3,19 @@ include = ["base.toml"] -## Network packages +# Package settings [packages] +drivers = {} netstack = {} netutils = {} +## Driver init +[[files]] +path = "/etc/init.d/00_drivers" +data = """ +pcid /etc/pcid.d/ +""" + ## Network init [[files]] path = "/etc/init.d/10_net" diff --git a/config/resist.toml b/config/resist.toml index 928ac3d..64b617f 100644 --- a/config/resist.toml +++ b/config/resist.toml @@ -12,7 +12,6 @@ filesystem_size = 256 bash = {} coreutils = {} diffutils = {} -drivers = {} extrautils = {} findutils = {} gcc13 = {} @@ -23,12 +22,6 @@ resist = {} userutils = {} uutils = {} -[[files]] -path = "/etc/init.d/00_drivers" -data = """ -pcid /etc/pcid.d/ -""" - # Override to not background dhcpd [[files]] path = "/etc/init.d/10_net" diff --git a/config/x86_64/demo.toml b/config/x86_64/demo.toml index 1436141..1d2a4fe 100644 --- a/config/x86_64/demo.toml +++ b/config/x86_64/demo.toml @@ -42,15 +42,12 @@ coreutils = {} cosmic-edit = {} cosmic-icons = {} diffutils = {} -drivers = {} -escalated = {} extrautils = {} findutils = {} installer = {} installer-gui = {} intel-one-mono = {} ion = {} -ipcd = {} netdb = {} netsurf = {} orbdata = {} @@ -59,7 +56,6 @@ orbterm = {} orbutils = {} pkgutils = {} pop-icon-theme = {} -ptyd = {} redoxfs = {} relibc = {} resist = {} @@ -100,15 +96,6 @@ gears = {} # MIDI freepats = {} -[[files]] -path = "/etc/init.d/00_base" -data = """ -ipcd -ptyd -pcid /etc/pcid.d/ -escalated -""" - [[files]] path = "/etc/init.d/20_orbital" data = """ diff --git a/config/x86_64/desktop-contain.toml b/config/x86_64/desktop-contain.toml index 39651d8..9528a02 100644 --- a/config/x86_64/desktop-contain.toml +++ b/config/x86_64/desktop-contain.toml @@ -18,14 +18,11 @@ ca-certificates = {} contain = {} coreutils = {} diffutils = {} -drivers = {} -escalated = {} extrautils = {} findutils = {} installer = {} installer-gui = {} ion = {} -ipcd = {} netdb = {} netsurf = {} orbdata = {} @@ -33,7 +30,6 @@ orbital = {} orbterm = {} orbutils = {} pkgutils = {} -ptyd = {} redoxfs = {} relibc = {} resist = {} @@ -45,15 +41,6 @@ git = {} curl = {} vim = {} -[[files]] -path = "/etc/init.d/00_base" -data = """ -ipcd -ptyd -pcid /etc/pcid.d/ -escalated -""" - [[files]] path = "/etc/init.d/20_orbital" data = """ diff --git a/config/x86_64/desktop.toml b/config/x86_64/desktop.toml index ae951c9..9569af6 100644 --- a/config/x86_64/desktop.toml +++ b/config/x86_64/desktop.toml @@ -18,14 +18,11 @@ ca-certificates = {} contain = {} coreutils = {} diffutils = {} -drivers = {} -escalated = {} extrautils = {} findutils = {} installer = {} installer-gui = {} ion = {} -ipcd = {} netdb = {} netsurf = {} orbdata = {} @@ -33,7 +30,6 @@ orbital = {} orbterm = {} orbutils = {} pkgutils = {} -ptyd = {} redoxfs = {} relibc = {} resist = {} @@ -45,15 +41,6 @@ git = {} curl = {} vim = {} -[[files]] -path = "/etc/init.d/00_base" -data = """ -ipcd -ptyd -pcid /etc/pcid.d/ -escalated -""" - [[files]] path = "/etc/init.d/20_orbital" data = """ diff --git a/config/x86_64/dev.toml b/config/x86_64/dev.toml index 691b59b..cc16080 100644 --- a/config/x86_64/dev.toml +++ b/config/x86_64/dev.toml @@ -18,14 +18,11 @@ ca-certificates = {} contain = {} coreutils = {} diffutils = {} -drivers = {} -escalated = {} extrautils = {} findutils = {} installer = {} installer-gui = {} ion = {} -ipcd = {} netdb = {} netsurf = {} orbdata = {} @@ -33,7 +30,6 @@ orbital = {} orbterm = {} orbutils = {} pkgutils = {} -ptyd = {} redoxfs = {} relibc = {} resist = {} @@ -65,15 +61,6 @@ fn main() { } """ -[[files]] -path = "/etc/init.d/00_base" -data = """ -ipcd -ptyd -pcid /etc/pcid.d/ -escalated -""" - [[files]] path = "/etc/init.d/20_orbital" data = """ diff --git a/config/x86_64/jeremy.toml b/config/x86_64/jeremy.toml index 19099d4..dc12882 100644 --- a/config/x86_64/jeremy.toml +++ b/config/x86_64/jeremy.toml @@ -18,14 +18,11 @@ ca-certificates = {} contain = {} coreutils = {} diffutils = {} -drivers = {} -escalated = {} extrautils = {} findutils = {} installer = {} installer-gui = {} ion = {} -ipcd = {} netdb = {} netsurf = {} orbdata = {} @@ -33,7 +30,6 @@ orbital = {} orbterm = {} orbutils = {} pkgutils = {} -ptyd = {} redoxfs = {} relibc = {} relibc-tests = {} @@ -148,15 +144,6 @@ terminfo = {} timidity = {} ttf-hack = {} -[[files]] -path = "/etc/init.d/00_base" -data = """ -ipcd -ptyd -pcid /etc/pcid.d/ -escalated -""" - [[files]] path = "/etc/init.d/20_orbital" data = """ diff --git a/config/x86_64/server.toml b/config/x86_64/server.toml index fe84ee3..20a8968 100644 --- a/config/x86_64/server.toml +++ b/config/x86_64/server.toml @@ -17,16 +17,12 @@ ca-certificates = {} contain = {} coreutils = {} diffutils = {} -drivers = {} -escalated = {} extrautils = {} findutils = {} installer = {} ion = {} -ipcd = {} netdb = {} pkgutils = {} -ptyd = {} redoxfs = {} resist = {} smith = {} @@ -37,15 +33,6 @@ git = {} curl = {} vim = {} -[[files]] -path = "/etc/init.d/00_base" -data = """ -ipcd -ptyd -pcid /etc/pcid.d/ -escalated -""" - [[files]] path = "/etc/init.d/30_console" data = """