From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 11/17] installer: Add code to proper unmount the BTRFS layout Date: Fri, 15 Mar 2024 20:14:36 +0100 Message-ID: <20240315191442.3951-12-stefan.schantl@ipfire.org> In-Reply-To: <20240315191442.3951-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0567662621071601604==" List-Id: --===============0567662621071601604== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Stefan Schantl --- src/installer/hw.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/installer/hw.c b/src/installer/hw.c index 1c4adc24b..b5b853e92 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -1106,13 +1106,36 @@ int hw_umount_filesystems(struct hw_destination* dest= , const char* prefix) { return -1; =20 // root - r =3D hw_umount(prefix, NULL); + if(dest->filesystem =3D=3D HW_FS_BTRFS) { + r =3D hw_umount_btrfs_layout(); + } else { + r =3D hw_umount(prefix, NULL); + } + if (r) return -1; =20 return 0; } =20 +int hw_umount_btrfs_layout() { + char path[STRING_SIZE]; + int r; + + // Reverse loop through the array of known subvolumes. + for ( int i =3D LEN(btrfs_subvolumes); i >=3D 0; i-- ) { + snprintf(path, sizeof(path), "%s%s", DESTINATION_MOUNT_PATH, btrfs_subvolu= mes[i][1]); + + // umount the subvolume. + r =3D hw_umount(path, NULL); + + if (r) + return r; + } + + return 0; +} + int hw_destroy_raid_superblocks(const struct hw_destination* dest, const cha= r* output) { char cmd[STRING_SIZE]; =20 --=20 2.39.2 --===============0567662621071601604==--