base: Re-shuffle base packages

Signed-off-by: Stéphane Graber <[email protected]>
lxc · Jan 14, 2025 · da15bcb · da15bcb
1 parent b0ddc94
commit da15bcb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 24 deletions.
diff --git a/mkosi.images/base/mkosi.conf.d/03-core-packages.conf b/mkosi.images/base/mkosi.conf.d/03-core-packages.conf
@@ -1,8 +1,13 @@
 [Content]
 Packages=
+    btrfs-progs
     dbus
-    plymouth
+    e2fsprogs
+    lvm2
+    lvm2-lockd
+    nftables
     systemd
+    systemd-boot
     systemd-container
     systemd-cryptsetup
     systemd-repart
@@ -11,3 +16,5 @@ Packages=
     systemd-zram-generator
     tpm2-tools
     udev
+RemoveFiles=
+    /usr/lib/systemd/system/nftables.service
diff --git a/mkosi.images/base/mkosi.conf.d/20-incus-deps.conf b/mkosi.images/base/mkosi.conf.d/20-incus-deps.conf
@@ -1,9 +0,0 @@
-[Content]
-Packages=
-    btrfs-progs
-    nftables
-    lvm2
-    lvm2-lockd
-RemoveFiles=
-    /usr/lib/systemd/system/nftables.service
-PrepareScripts=mkosi.conf.d/20-incus-deps.sh

diff --git a/mkosi.images/base/mkosi.conf.d/20-incus-deps.sh b/mkosi.images/base/mkosi.conf.d/20-incus-deps.sh