From acb33974f2da7863e2d527518b01f82c2613e3a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
Date: Thu, 13 Nov 2025 19:05:16 -0500
Subject: [PATCH] images/incus: Split ceph and linstor support to own images
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
---
 mkosi.images/incus-ceph/install.sh    |  7 +++++++
 mkosi.images/incus-ceph/mkosi.conf    | 12 ++++++++++++
 mkosi.images/incus-linstor/install.sh | 24 ++++++++++++++++++++++++
 mkosi.images/incus-linstor/mkosi.conf | 12 ++++++++++++
 mkosi.images/incus/install.sh         | 18 ------------------
 5 files changed, 55 insertions(+), 18 deletions(-)
 create mode 100755 mkosi.images/incus-ceph/install.sh
 create mode 100644 mkosi.images/incus-ceph/mkosi.conf
 create mode 100755 mkosi.images/incus-linstor/install.sh
 create mode 100644 mkosi.images/incus-linstor/mkosi.conf

diff --git a/mkosi.images/incus-ceph/install.sh b/mkosi.images/incus-ceph/install.sh
new file mode 100755
index 0000000..2493b7d
--- /dev/null
+++ b/mkosi.images/incus-ceph/install.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+[ "$1" = "final" ] || exit 0
+
+# Install the packages.
+apt-get install ceph-common --yes
+
+exit 0
diff --git a/mkosi.images/incus-ceph/mkosi.conf b/mkosi.images/incus-ceph/mkosi.conf
new file mode 100644
index 0000000..d337f60
--- /dev/null
+++ b/mkosi.images/incus-ceph/mkosi.conf
@@ -0,0 +1,12 @@
+[Config]
+Dependencies=base
+
+[Output]
+Format=sysext
+Overlay=yes
+ManifestFormat=json
+ImageVersion=
+
+[Content]
+BaseTrees=%O/base
+PrepareScripts=install.sh
diff --git a/mkosi.images/incus-linstor/install.sh b/mkosi.images/incus-linstor/install.sh
new file mode 100755
index 0000000..a5284cd
--- /dev/null
+++ b/mkosi.images/incus-linstor/install.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+[ "$1" = "final" ] || exit 0
+
+# Install the packages.
+mkdir -p /run/lock
+apt-get update
+apt-get install drbd-utils linstor-satellite lsscsi socat thin-send-recv --yes
+
+rm \
+    "/buildroot/usr/bin/java" \
+    "/buildroot/usr/bin/jexec" \
+    "/buildroot/usr/bin/jpackage" \
+    "/buildroot/usr/bin/keytool" \
+    "/buildroot/usr/bin/rmiregistry"
+
+ln -s "/usr/lib/jvm/java-21-openjdk-amd64/lib/jexec" "/buildroot/usr/bin/jexec"
+ln -s "/usr/lib/jvm/java-21-openjdk-amd64/bin/java" "/buildroot/usr/bin/java"
+ln -s "/usr/lib/jvm/java-21-openjdk-amd64/bin/jpackage" "/buildroot/usr/bin/jpackage"
+ln -s "/usr/lib/jvm/java-21-openjdk-amd64/bin/keytool" "/buildroot/usr/bin/keytool"
+ln -s "/usr/lib/jvm/java-21-openjdk-amd64/bin/rmiregistry" "/buildroot/usr/bin/rmiregistry"
+
+mv /buildroot/etc/java-21-openjdk/ /buildroot/usr/share/java-21-openjdk/
+
+exit 0
diff --git a/mkosi.images/incus-linstor/mkosi.conf b/mkosi.images/incus-linstor/mkosi.conf
new file mode 100644
index 0000000..d337f60
--- /dev/null
+++ b/mkosi.images/incus-linstor/mkosi.conf
@@ -0,0 +1,12 @@
+[Config]
+Dependencies=base
+
+[Output]
+Format=sysext
+Overlay=yes
+ManifestFormat=json
+ImageVersion=
+
+[Content]
+BaseTrees=%O/base
+PrepareScripts=install.sh
diff --git a/mkosi.images/incus/install.sh b/mkosi.images/incus/install.sh
index 7c7d84c..49d9678 100755
--- a/mkosi.images/incus/install.sh
+++ b/mkosi.images/incus/install.sh
@@ -19,25 +19,7 @@ Signed-By: /etc/apt/keyrings/zabbly.asc
 EOF
 
 # Install the incus packages.
-mkdir -p /run/lock
 apt-get update
-apt-get install ceph-common --yes
-apt-get install drbd-utils linstor-satellite lsscsi socat thin-send-recv --yes
 apt-get install incus incus-ui-canonical --yes
 
-rm \
-    "/buildroot/usr/bin/java" \
-    "/buildroot/usr/bin/jexec" \
-    "/buildroot/usr/bin/jpackage" \
-    "/buildroot/usr/bin/keytool" \
-    "/buildroot/usr/bin/rmiregistry"
-
-ln -s "/usr/lib/jvm/java-21-openjdk-amd64/lib/jexec" "/buildroot/usr/bin/jexec"
-ln -s "/usr/lib/jvm/java-21-openjdk-amd64/bin/java" "/buildroot/usr/bin/java"
-ln -s "/usr/lib/jvm/java-21-openjdk-amd64/bin/jpackage" "/buildroot/usr/bin/jpackage"
-ln -s "/usr/lib/jvm/java-21-openjdk-amd64/bin/keytool" "/buildroot/usr/bin/keytool"
-ln -s "/usr/lib/jvm/java-21-openjdk-amd64/bin/rmiregistry" "/buildroot/usr/bin/rmiregistry"
-
-mv /buildroot/etc/java-21-openjdk/ /buildroot/usr/share/java-21-openjdk/
-
 exit 0