From a37f7758c2d9ecc108935456520632f97fdac587 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Jul 31 2023 19:45:40 +0000
Subject: platforms: Set subvolume mountpoints correctly


Without these being set, kiwi sets up a weird subvolume layout by
default.

---

diff --git a/platforms/minimal.xml b/platforms/minimal.xml
index 23b13a3..ca2d279 100644
--- a/platforms/minimal.xml
+++ b/platforms/minimal.xml
@@ -6,11 +6,11 @@
 		</profile>
 	</profiles>
 	<preferences profiles="Minimal">
-		<type image="oem" filesystem="btrfs" kernelcmdline="" target_blocksize="4096" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="500" firmware="uefi" fsmountoptions="x-systemd.growfs,compress=zstd:1">
+		<type image="oem" filesystem="btrfs" kernelcmdline="" target_blocksize="4096" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="500" firmware="uefi" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora" fsmountoptions="x-systemd.growfs,compress=zstd:1">
 			<bootloader name="grub2" console="console" timeout="5" timeout_style="hidden"/>
 			<systemdisk name="fedora">
-				<volume name="home"/>
-				<volume name="root"/>
+				<volume name="@root=root"/>
+				<volume name="home" parent="/"/>
 			</systemdisk>
 			<oemconfig>
 				<oem-resize>false</oem-resize>
diff --git a/platforms/server.xml b/platforms/server.xml
index fcbf09a..a63a713 100644
--- a/platforms/server.xml
+++ b/platforms/server.xml
@@ -6,12 +6,12 @@
 		</profile>
 	</profiles>
 	<preferences profiles="Server">
-		<type image="oem" filesystem="btrfs" kernelcmdline="" target_blocksize="4096" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="500" firmware="uefi" fsmountoptions="x-systemd.growfs,compress=zstd:1">
+		<type image="oem" filesystem="btrfs" kernelcmdline="" target_blocksize="4096" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="500" firmware="uefi" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora" fsmountoptions="x-systemd.growfs,compress=zstd:1">
 			<bootloader name="grub2" console="console" timeout="5" timeout_style="hidden"/>
 			<systemdisk name="fedora">
-				<volume name="home"/>
-				<volume name="root"/>
-				<volume name="var"/>
+				<volume name="@root=root"/>
+				<volume name="home" parent="/"/>
+				<volume name="var" parent="/"/>
 			</systemdisk>
 			<oemconfig>
 				<oem-resize>false</oem-resize>
diff --git a/platforms/workstation.xml b/platforms/workstation.xml
index baa59f3..3de2f0a 100644
--- a/platforms/workstation.xml
+++ b/platforms/workstation.xml
@@ -14,11 +14,11 @@
 		</profile>
 	</profiles>
 	<preferences profiles="WorkstationCommon">
-		<type image="oem" filesystem="btrfs" kernelcmdline="rhgb quiet" target_blocksize="4096" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="500" firmware="uefi" fsmountoptions="x-systemd.growfs,compress=zstd:1">
+		<type image="oem" filesystem="btrfs" kernelcmdline="rhgb quiet" target_blocksize="4096" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="500" firmware="uefi" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora" fsmountoptions="x-systemd.growfs,compress=zstd:1">
 			<bootloader name="grub2" console="console" timeout="5" timeout_style="hidden"/>
 			<systemdisk name="fedora">
-				<volume name="home"/>
-				<volume name="root"/>
+				<volume name="@root=root"/>
+				<volume name="home" parent="/"/>
 			</systemdisk>
 			<oemconfig>
 				<oem-resize>false</oem-resize>