From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCHv2 09/12] installer: Mount BTRFS layout before installing the system Date: Sat, 23 Mar 2024 11:56:26 +0100 Message-ID: <20240323105629.371511-9-stefan.schantl@ipfire.org> In-Reply-To: <20240323105629.371511-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8659895094384089769==" List-Id: --===============8659895094384089769== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Stefan Schantl --- src/installer/hw.c | 57 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/src/installer/hw.c b/src/installer/hw.c index ba6064cf5..8ee6c5726 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -935,6 +935,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 @@ -962,9 +963,17 @@ int hw_mount_filesystems(struct hw_destination* dest, co= nst 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); @@ -1028,6 +1037,48 @@ int hw_mount_filesystems(struct hw_destination* dest, = const char* prefix) { return 0; } =20 +int hw_mount_btrfs_subvolumes(const char* source) { + const struct btrfs_subvolumes* subvolume =3D NULL; + char path[STRING_SIZE]; + char options[STRING_SIZE]; + int r; + + // Loop through the list of known subvolumes. + for ( subvolume =3D btrfs_subvolumes; subvolume->name; subvolume++ ) { + // Assign subvolume path. + r =3D snprintf(path, sizeof(path), "%s%s", DESTINATION_MOUNT_PATH, subvolu= me->mount_path); + + if (r < 0) { + return r; + } + + // Assign subvolume name. + r =3D snprintf(options, sizeof(options), "subvol=3D%s,", subvolume->name); + if (r < 0) { + return r; + } + + // Create the directory. + r =3D hw_mkdir(path, S_IRWXU|S_IRWXG|S_IRWXO); + + // Abort if the directory could not be created. + if(r !=3D 0 && errno !=3D EEXIST) + return r; + + // Print log message + fprintf(flog, "Mounting subvolume %s to %s\n", subvolume->name, subvolume-= >mount_path); + + // Try to mount the subvolume. + r =3D mount(source, path, "btrfs", NULL, options); + + if (r) { + return r; + } + } +=09 + return 0; +} + int hw_umount_filesystems(struct hw_destination* dest, const char* prefix) { int r; char target[STRING_SIZE]; --=20 2.39.2 --===============8659895094384089769==--