From bc36226dd7d1c4d6d7b83e512e2218e9a31425a4 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 4 Jan 2024 11:36:45 -0700 Subject: [PATCH] Move user configuration to base --- config/aarch64/acid.toml | 12 ------------ config/aarch64/demo.toml | 12 ------------ config/aarch64/desktop-minimal.toml | 12 ------------ config/aarch64/desktop.toml | 12 ------------ config/aarch64/dev.toml | 12 ------------ config/aarch64/jeremy.toml | 12 ------------ config/aarch64/raspi3bp/server-minimal.toml | 12 ------------ config/aarch64/resist.toml | 12 ------------ config/aarch64/server-minimal.toml | 12 ------------ config/aarch64/server.toml | 12 ------------ config/base.toml | 12 ++++++++++++ config/i686/acid.toml | 12 ------------ config/i686/demo.toml | 12 ------------ config/i686/desktop-minimal.toml | 12 ------------ config/i686/desktop.toml | 12 ------------ config/i686/dev.toml | 12 ------------ config/i686/jeremy.toml | 12 ------------ config/i686/resist.toml | 12 ------------ config/i686/server-minimal.toml | 12 ------------ config/i686/server.toml | 12 ------------ config/x86_64/demo.toml | 12 ------------ config/x86_64/desktop-contain.toml | 12 ------------ config/x86_64/desktop-minimal.toml | 12 ------------ config/x86_64/desktop.toml | 12 ------------ config/x86_64/dev.toml | 12 ------------ config/x86_64/jeremy.toml | 12 ------------ config/x86_64/resist.toml | 12 ------------ config/x86_64/server-minimal.toml | 12 ------------ config/x86_64/server.toml | 12 ------------ 29 files changed, 12 insertions(+), 336 deletions(-) diff --git a/config/aarch64/acid.toml b/config/aarch64/acid.toml index 5f83a00..ca8afca 100644 --- a/config/aarch64/acid.toml +++ b/config/aarch64/acid.toml @@ -20,18 +20,6 @@ ion = {} ipcd = {} ptyd = {} -# 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 = """ diff --git a/config/aarch64/demo.toml b/config/aarch64/demo.toml index 874e13a..5ab5a11 100644 --- a/config/aarch64/demo.toml +++ b/config/aarch64/demo.toml @@ -44,18 +44,6 @@ git = {} curl = {} vim = {} -# 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 = """ diff --git a/config/aarch64/desktop-minimal.toml b/config/aarch64/desktop-minimal.toml index 4aaad1f..89f737b 100644 --- a/config/aarch64/desktop-minimal.toml +++ b/config/aarch64/desktop-minimal.toml @@ -28,18 +28,6 @@ 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 = """ diff --git a/config/aarch64/desktop.toml b/config/aarch64/desktop.toml index 287a95b..92fd3eb 100644 --- a/config/aarch64/desktop.toml +++ b/config/aarch64/desktop.toml @@ -44,18 +44,6 @@ git = {} curl = {} vim = {} -# 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 = """ diff --git a/config/aarch64/dev.toml b/config/aarch64/dev.toml index d0355de..55e269a 100644 --- a/config/aarch64/dev.toml +++ b/config/aarch64/dev.toml @@ -57,18 +57,6 @@ gnu-binutils = {} gnu-make = {} rust = {} -# User settings -[users.root] -password = "password" -uid = 0 -gid = 0 -name = "root" -home = "/root" - -[users.user] -# Password is unset -password = "" - [[files]] path = "/home/user/example.rs" data = """ diff --git a/config/aarch64/jeremy.toml b/config/aarch64/jeremy.toml index 2323013..c1b6065 100644 --- a/config/aarch64/jeremy.toml +++ b/config/aarch64/jeremy.toml @@ -40,18 +40,6 @@ 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 = """ diff --git a/config/aarch64/raspi3bp/server-minimal.toml b/config/aarch64/raspi3bp/server-minimal.toml index e67b491..c5f7fda 100644 --- a/config/aarch64/raspi3bp/server-minimal.toml +++ b/config/aarch64/raspi3bp/server-minimal.toml @@ -23,18 +23,6 @@ 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 = """ diff --git a/config/aarch64/resist.toml b/config/aarch64/resist.toml index fa54e55..5fc8000 100644 --- a/config/aarch64/resist.toml +++ b/config/aarch64/resist.toml @@ -29,18 +29,6 @@ resist = {} 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 = """ diff --git a/config/aarch64/server-minimal.toml b/config/aarch64/server-minimal.toml index 2ed56fc..d76b31f 100644 --- a/config/aarch64/server-minimal.toml +++ b/config/aarch64/server-minimal.toml @@ -22,18 +22,6 @@ 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 = """ diff --git a/config/aarch64/server.toml b/config/aarch64/server.toml index 0306e65..aa744f9 100644 --- a/config/aarch64/server.toml +++ b/config/aarch64/server.toml @@ -41,18 +41,6 @@ git = {} curl = {} vim = {} -# 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 = """ diff --git a/config/base.toml b/config/base.toml index 896b7b7..a97212f 100644 --- a/config/base.toml +++ b/config/base.toml @@ -73,3 +73,15 @@ symlink = true path = "/dev/zero" data = "zero:" symlink = true + +# User settings +[users.root] +password = "password" +uid = 0 +gid = 0 +name = "root" +home = "/root" + +[users.user] +# Password is unset +password = "" diff --git a/config/i686/acid.toml b/config/i686/acid.toml index 5f83a00..ca8afca 100644 --- a/config/i686/acid.toml +++ b/config/i686/acid.toml @@ -20,18 +20,6 @@ ion = {} ipcd = {} ptyd = {} -# 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 = """ diff --git a/config/i686/demo.toml b/config/i686/demo.toml index 1d24599..4098c69 100644 --- a/config/i686/demo.toml +++ b/config/i686/demo.toml @@ -79,18 +79,6 @@ pixelcannon = {} # MIDI freepats = {} -# 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 = """ diff --git a/config/i686/desktop-minimal.toml b/config/i686/desktop-minimal.toml index 4aaad1f..89f737b 100644 --- a/config/i686/desktop-minimal.toml +++ b/config/i686/desktop-minimal.toml @@ -28,18 +28,6 @@ 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 = """ diff --git a/config/i686/desktop.toml b/config/i686/desktop.toml index aed5b2e..300f4d7 100644 --- a/config/i686/desktop.toml +++ b/config/i686/desktop.toml @@ -45,18 +45,6 @@ git = {} curl = {} vim = {} -# 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 = """ diff --git a/config/i686/dev.toml b/config/i686/dev.toml index d0355de..55e269a 100644 --- a/config/i686/dev.toml +++ b/config/i686/dev.toml @@ -57,18 +57,6 @@ gnu-binutils = {} gnu-make = {} rust = {} -# User settings -[users.root] -password = "password" -uid = 0 -gid = 0 -name = "root" -home = "/root" - -[users.user] -# Password is unset -password = "" - [[files]] path = "/home/user/example.rs" data = """ diff --git a/config/i686/jeremy.toml b/config/i686/jeremy.toml index cd573b0..ba7c4b5 100644 --- a/config/i686/jeremy.toml +++ b/config/i686/jeremy.toml @@ -72,18 +72,6 @@ keyboard-sfx = {} terminfo = {} ttf-hack = {} -# 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 = """ diff --git a/config/i686/resist.toml b/config/i686/resist.toml index fa54e55..5fc8000 100644 --- a/config/i686/resist.toml +++ b/config/i686/resist.toml @@ -29,18 +29,6 @@ resist = {} 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 = """ diff --git a/config/i686/server-minimal.toml b/config/i686/server-minimal.toml index 2ed56fc..d76b31f 100644 --- a/config/i686/server-minimal.toml +++ b/config/i686/server-minimal.toml @@ -22,18 +22,6 @@ 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 = """ diff --git a/config/i686/server.toml b/config/i686/server.toml index 071f81e..8dfc1ad 100644 --- a/config/i686/server.toml +++ b/config/i686/server.toml @@ -37,18 +37,6 @@ git = {} curl = {} vim = {} -# 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 = """ diff --git a/config/x86_64/demo.toml b/config/x86_64/demo.toml index 31a96b7..1238e8b 100644 --- a/config/x86_64/demo.toml +++ b/config/x86_64/demo.toml @@ -100,18 +100,6 @@ gears = {} # MIDI freepats = {} -# 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 = """ diff --git a/config/x86_64/desktop-contain.toml b/config/x86_64/desktop-contain.toml index 277ba8a..8304b17 100644 --- a/config/x86_64/desktop-contain.toml +++ b/config/x86_64/desktop-contain.toml @@ -45,18 +45,6 @@ git = {} curl = {} vim = {} -# 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 = """ diff --git a/config/x86_64/desktop-minimal.toml b/config/x86_64/desktop-minimal.toml index 4aaad1f..89f737b 100644 --- a/config/x86_64/desktop-minimal.toml +++ b/config/x86_64/desktop-minimal.toml @@ -28,18 +28,6 @@ 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 = """ diff --git a/config/x86_64/desktop.toml b/config/x86_64/desktop.toml index aed5b2e..300f4d7 100644 --- a/config/x86_64/desktop.toml +++ b/config/x86_64/desktop.toml @@ -45,18 +45,6 @@ git = {} curl = {} vim = {} -# 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 = """ diff --git a/config/x86_64/dev.toml b/config/x86_64/dev.toml index d0355de..55e269a 100644 --- a/config/x86_64/dev.toml +++ b/config/x86_64/dev.toml @@ -57,18 +57,6 @@ gnu-binutils = {} gnu-make = {} rust = {} -# User settings -[users.root] -password = "password" -uid = 0 -gid = 0 -name = "root" -home = "/root" - -[users.user] -# Password is unset -password = "" - [[files]] path = "/home/user/example.rs" data = """ diff --git a/config/x86_64/jeremy.toml b/config/x86_64/jeremy.toml index 5a82647..f7885f4 100644 --- a/config/x86_64/jeremy.toml +++ b/config/x86_64/jeremy.toml @@ -148,18 +148,6 @@ terminfo = {} timidity = {} ttf-hack = {} -# 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 = """ diff --git a/config/x86_64/resist.toml b/config/x86_64/resist.toml index fa54e55..5fc8000 100644 --- a/config/x86_64/resist.toml +++ b/config/x86_64/resist.toml @@ -29,18 +29,6 @@ resist = {} 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 = """ diff --git a/config/x86_64/server-minimal.toml b/config/x86_64/server-minimal.toml index 2ed56fc..d76b31f 100644 --- a/config/x86_64/server-minimal.toml +++ b/config/x86_64/server-minimal.toml @@ -22,18 +22,6 @@ 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 = """ diff --git a/config/x86_64/server.toml b/config/x86_64/server.toml index 071f81e..8dfc1ad 100644 --- a/config/x86_64/server.toml +++ b/config/x86_64/server.toml @@ -37,18 +37,6 @@ git = {} curl = {} vim = {} -# 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 = """