From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: [PATCH 08/17] installer: Mount BTRFS layout  before installing the system
Date: Mon, 18 Mar 2024 16:11:36 +0000
Message-ID: <5B3C21D5-604C-417C-9E6D-990EAE550BC2@ipfire.org>
In-Reply-To: <20240315191442.3951-9-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6178128317984805624=="
List-Id: <development.lists.ipfire.org>

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



> On 15 Mar 2024, at 19:14, Stefan Schantl <stefan.schantl(a)ipfire.org> wrot=
e:
>=20
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> src/installer/hw.c | 48 +++++++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 45 insertions(+), 3 deletions(-)
>=20
> diff --git a/src/installer/hw.c b/src/installer/hw.c
> index cb6a8ab81..e520fb687 100644
> --- a/src/installer/hw.c
> +++ b/src/installer/hw.c
> @@ -926,6 +926,7 @@ int hw_create_btrfs_layout(const char* path, const char=
* output) {
>=20
> int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) {
> char target[STRING_SIZE];
> + int r;
>=20
> assert(*prefix =3D=3D '/');
>=20
> @@ -953,9 +954,17 @@ int hw_mount_filesystems(struct hw_destination* dest, =
const char* prefix) {
> }
>=20
> // root
> - int r =3D hw_mount(dest->part_root, prefix, filesystem, 0);
> - if (r)
> - return r;
> + if (dest->filesystem =3D=3D HW_FS_BTRFS) {
> + r =3D hw_mount_btrfs_subvolumes(dest->part_root);
> +
> + if (r)
> + return r;
> + } else {
> + r =3D hw_mount(dest->part_root, prefix, filesystem, 0);
> +
> + if (r)
> + return r;
> + }
>=20
> // boot
> snprintf(target, sizeof(target), "%s%s", prefix, HW_PATH_BOOT);
> @@ -1019,6 +1028,39 @@ int hw_mount_filesystems(struct hw_destination* dest=
, const char* prefix) {
> return 0;
> }
>=20
> +int hw_mount_btrfs_subvolumes(const char* source) {
> + int r;
> + char path[STRING_SIZE];
> + char options[STRING_SIZE];
> +
> + // Mount the root subvolume
> + snprintf(options, sizeof(options), "subvol=3D%s,%s", btrfs_subvolumes[0][=
0], BTRFS_MOUNT_OPTIONS);
> + r =3D mount(source, DESTINATION_MOUNT_PATH, "btrfs", NULL, options);

Why is this not inside the loop when it is just a regular subvolume?

> +
> + if (r)
> + return r;
> +
> + // Loop through the remain array of known subvolumes.
> + for ( int i =3D 1; i < LEN(btrfs_subvolumes); i++ ) {
> + snprintf(path, sizeof(path), "%s%s", DESTINATION_MOUNT_PATH, btrfs_subvol=
umes[i][1]);
> + snprintf(options, sizeof(options), "subvol=3D%s,", btrfs_subvolumes[i][0]=
, BTRFS_MOUNT_OPTIONS);

Likewise, please check the return code of snprintf.

> +
> + // Create the directory.
> + r =3D hw_mkdir(path, S_IRWXU|S_IRWXG|S_IRWXO);
> +
> + if(r !=3D 0 && errno !=3D EEXIST)
> + return r;
> +
> + // Try to mount the subvolume.
> + r =3D mount(source, path, "btrfs", NULL, options);
> +
> + if (r)
> + return r;
> + }
> +=20
> + return 0;
> +}
> +
> int hw_umount_filesystems(struct hw_destination* dest, const char* prefix) {
> int r;
> char target[STRING_SIZE];
> --=20
> 2.39.2
>=20


--===============6178128317984805624==--