From 62429864e9ae2ff540cfc2d865bb20975005db73 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sun, 1 Mar 2026 14:21:57 +0100
Subject: [PATCH] Add pkgutils to minimal config

And remove the dedicated minimal-net config.
---
 config/aarch64/minimal-net.toml   | 14 --------------
 config/desktop-minimal.toml       |  2 +-
 config/i586/minimal-net.toml      | 14 --------------
 config/minimal-net.toml           | 28 ----------------------------
 config/minimal.toml               |  2 ++
 config/riscv64gc/minimal-net.toml | 14 --------------
 config/x86_64/minimal-net.toml    | 14 --------------
 7 files changed, 3 insertions(+), 85 deletions(-)
 delete mode 100644 config/aarch64/minimal-net.toml
 delete mode 100644 config/i586/minimal-net.toml
 delete mode 100644 config/minimal-net.toml
 delete mode 100644 config/riscv64gc/minimal-net.toml
 delete mode 100644 config/x86_64/minimal-net.toml

diff --git a/config/aarch64/minimal-net.toml b/config/aarch64/minimal-net.toml
deleted file mode 100644
index bcdb3af0..00000000
--- a/config/aarch64/minimal-net.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Minimal network configuration
-
-include = ["../minimal-net.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file
diff --git a/config/desktop-minimal.toml b/config/desktop-minimal.toml
index a4b2eafc..99f64f96 100644
--- a/config/desktop-minimal.toml
+++ b/config/desktop-minimal.toml
@@ -1,6 +1,6 @@
 # Minimal desktop configuration
 
-include = ["minimal-net.toml"]
+include = ["minimal.toml"]
 
 # General settings
 [general]
diff --git a/config/i586/minimal-net.toml b/config/i586/minimal-net.toml
deleted file mode 100644
index bcdb3af0..00000000
--- a/config/i586/minimal-net.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Minimal network configuration
-
-include = ["../minimal-net.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file
diff --git a/config/minimal-net.toml b/config/minimal-net.toml
deleted file mode 100644
index f71af309..00000000
--- a/config/minimal-net.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Minimal network configuration
-
-include = ["base.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 256
-
-# Package settings
-[packages]
-ca-certificates = {}
-coreutils = {}
-extrautils = {}
-findutils = {}
-ion = {}
-pkgutils = {}
-kibi = {}
-
-[[files]]
-path = "/usr/lib/init.d/30_console"
-data = """
-requires_weak 10_net
-inputd -A 2
-nowait getty 2
-nowait getty /scheme/debug/no-preserve -J
-"""
-
diff --git a/config/minimal.toml b/config/minimal.toml
index ae24a6fd..5f110740 100644
--- a/config/minimal.toml
+++ b/config/minimal.toml
@@ -9,9 +9,11 @@ filesystem_size = 196
 
 # Package settings
 [packages]
+ca-certificates = {}
 coreutils = {}
 extrautils = {}
 ion = {}
+pkgutils = {}
 kibi = {}
 
 [[files]]
diff --git a/config/riscv64gc/minimal-net.toml b/config/riscv64gc/minimal-net.toml
deleted file mode 100644
index bcdb3af0..00000000
--- a/config/riscv64gc/minimal-net.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Minimal network configuration
-
-include = ["../minimal-net.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file
diff --git a/config/x86_64/minimal-net.toml b/config/x86_64/minimal-net.toml
deleted file mode 100644
index bcdb3af0..00000000
--- a/config/x86_64/minimal-net.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Minimal network configuration
-
-include = ["../minimal-net.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# example = {}
\ No newline at end of file