From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCHv2 12/12] installer: Add code to correctly write the fstab when installing on BTRFS Date: Sat, 23 Mar 2024 11:56:29 +0100 Message-ID: <20240323105629.371511-12-stefan.schantl@ipfire.org> In-Reply-To: <20240323105629.371511-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5901737530683942606==" List-Id: --===============5901737530683942606== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Stefan Schantl --- src/installer/hw.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/installer/hw.c b/src/installer/hw.c index 3b26920d1..77789e35e 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -1319,11 +1319,13 @@ static char* hw_get_uuid(const char* dev) { #define FSTAB_FMT "UUID=3D%s %-8s %-4s %-10s %d %d\n" =20 int hw_write_fstab(struct hw_destination* dest) { + const struct btrfs_subvolumes* subvolume =3D NULL; FILE* f =3D fopen(DESTINATION_MOUNT_PATH "/etc/fstab", "w"); if (!f) return -1; =20 char* uuid =3D NULL; + char mount_options[STRING_SIZE]; =20 // boot if (*dest->part_boot) { @@ -1359,7 +1361,22 @@ int hw_write_fstab(struct hw_destination* dest) { // root uuid =3D hw_get_uuid(dest->part_root); if (uuid) { - fprintf(f, FSTAB_FMT, uuid, "/", "auto", "defaults", 1, 1); + if(dest->filesystem =3D=3D HW_FS_BTRFS) { + // Loop through the list of subvolumes + for (subvolume =3D btrfs_subvolumes; subvolume->name; subvolume++) { + // Abort if the mount options could not be assigned + int r =3D snprintf(mount_options, sizeof(mount_options), "defaults,%s,su= bvol=3D%s", BTRFS_MOUNT_OPTIONS, subvolume->name); + if (r < 0) { + return r; + } + + // Write the entry to the file + fprintf(f, FSTAB_FMT, uuid, subvolume->mount_path, "btrfs", mount_option= s, 1, 1); + } + } else { + fprintf(f, FSTAB_FMT, uuid, "/", "auto", "defaults", 1, 1); + } + free(uuid); } =20 --=20 2.39.2 --===============5901737530683942606==--