From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject:
 [PATCHv2 06/12] installer: Add code to create a BTRFS subvolume layout
Date: Sat, 23 Mar 2024 11:56:23 +0100
Message-ID: <20240323105629.371511-6-stefan.schantl@ipfire.org>
In-Reply-To: <20240323105629.371511-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6259464424384888804=="
List-Id: <development.lists.ipfire.org>

--===============6259464424384888804==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 src/installer/hw.c | 80 ++++++++++++++++++++++++++++++++++++++++++++--
 src/installer/hw.h | 20 ++++++++++++
 2 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/src/installer/hw.c b/src/installer/hw.c
index 11dbcd96d..8396d83cf 100644
--- a/src/installer/hw.c
+++ b/src/installer/hw.c
@@ -810,6 +810,7 @@ int hw_create_partitions(struct hw_destination* dest, con=
st char* output) {
=20
 static int hw_format_filesystem(const char* path, int fs, const char* output=
) {
 	char cmd[STRING_SIZE] =3D "\0";
+	int r;
=20
 	// Swap
 	if (fs =3D=3D HW_FS_SWAP) {
@@ -829,7 +830,9 @@ static int hw_format_filesystem(const char* path, int fs,=
 const char* output) {
=20
 	// BTRFS
 	} else if (fs =3D=3D HW_FS_BTRFS) {
-		snprintf(cmd, sizeof(cmd), "/usr/bin/mkfs.btrfs -f %s", path);
+		r =3D hw_create_btrfs_layout(path, output);
+
+		return r;
=20
 	// FAT32
 	} else if (fs =3D=3D HW_FS_FAT32) {
@@ -838,7 +841,7 @@ static int hw_format_filesystem(const char* path, int fs,=
 const char* output) {
=20
 	assert(*cmd);
=20
-	int r =3D mysystem(output, cmd);
+	r =3D mysystem(output, cmd);
=20
 	return r;
 }
@@ -875,6 +878,59 @@ int hw_create_filesystems(struct hw_destination* dest, c=
onst char* output) {
 	return 0;
 }
=20
+int hw_create_btrfs_layout(const char* path, const char* output) {
+	const struct btrfs_subvolumes* subvolume =3D NULL;
+	char cmd[STRING_SIZE];
+	char volume[STRING_SIZE];
+	int r;
+
+	r =3D snprintf(cmd, sizeof(cmd), "/usr/bin/mkfs.btrfs -f %s", path);
+	if (r < 0) {
+		return r;
+	}
+
+	// Create the main BTRFS file system.
+	r =3D mysystem(output, cmd);
+
+	if (r) {
+		return r;
+	}
+
+
+	// We need to mount the FS in order to create any subvolumes.
+	r =3D hw_mount(path, DESTINATION_MOUNT_PATH, "btrfs", 0);
+
+	if (r) {
+		return r;
+	}
+
+	// Loop through the list of subvolumes to create.
+	for ( subvolume =3D btrfs_subvolumes; subvolume->name; subvolume++ ) {
+		r =3D snprintf(volume, sizeof(volume), "%s", subvolume->name);
+
+		// Abort if snprintf fails.
+		if (r < 0) {
+			return r;
+		}
+
+		// Call function to create the subvolume
+		r =3D hw_create_btrfs_subvolume(output, volume);
+
+		if (r) {
+			return r;
+		}
+	}
+
+	// Umount the main BTRFS after subvolume creation.
+	r =3D hw_umount(DESTINATION_MOUNT_PATH, 0);
+
+	if (r) {
+		return r;
+	}
+
+	return 0;
+}
+
 int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) {
 	char target[STRING_SIZE];
=20
@@ -1224,3 +1280,23 @@ int hw_restore_backup(const char* output, const char* =
backup_path, const char* d
=20
 	return 0;
 }
+
+int hw_create_btrfs_subvolume(const char* output, const char* subvolume) {
+	char command [STRING_SIZE];
+	int r;
+
+	// Abort if the command could not be assigned.
+	r =3D snprintf(command, sizeof(command), "/usr/bin/btrfs subvolume create  =
%s/%s", DESTINATION_MOUNT_PATH, subvolume);
+	if (r < 0) {
+		return r;
+	}
+
+	// Create the subvolume
+	r =3D mysystem(output, command);
+
+	if (r) {
+		return r;
+	}
+
+	return 0;
+}
diff --git a/src/installer/hw.h b/src/installer/hw.h
index e5ee65a6d..73a5233e2 100644
--- a/src/installer/hw.h
+++ b/src/installer/hw.h
@@ -104,6 +104,26 @@ struct hw_destination {
 	unsigned long long size_root;
 };
=20
+// Struct to define the BTRFS subvolumes layout
+static const struct btrfs_subvolumes {
+	const char* name;
+	const char* mount_path;
+} btrfs_subvolumes[] =3D {
+	{ "@",          "/" },
+	{ "@snapshots", "/.snapshots" },
+	{ "@home",      "/home" },
+	{ "@root",      "/root" },
+	{ "@cache",     "/var/cache" },
+	{ "@backups",   "/var/ipfire/backup" },
+	{ "@lib",       "/var/lib" },
+	{ "@logs",      "/var/log" },
+	{ "@mails",     "/var/mail" },
+	{ "@tmp",       "/var/tmp" },
+
+	// Sentinel
+	{ NULL },
+};
+
 struct hw* hw_init();
 void hw_free(struct hw* hw);
=20
--=20
2.39.2


--===============6259464424384888804==--