Clone/New-Cli-Installer
1
0
Fork 0
mirror of https://github.com/CachyOS/New-Cli-Installer.git synced 2025-01-23 05:52:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

👷 tui: put LUKS information about partitions into the scheme

Browse Source
This commit is contained in:
Vladislav Nepogodin 2024-07-29 02:05:09 +04:00
parent 075cec2e01
commit 382522f98d
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/tui.cpp
View File

@ -1717,7 +1717,7 @@ auto mount_root_partition(std::vector<gucc::fs::Partition>& partitions) noexcept
// utils::delete_partition_in_list(std::get<std::string>(config_data["ROOT_PART"]));
// TODO(vnepogodin): parse luks information
// get options used for mounting the current partition
const auto& mount_opts_info = std::get<std::string>(config_data["MOUNT_OPTS"]);
const auto& part_fs = gucc::fs::utils::get_mountpoint_fs(mountpoint_info);
@ -1726,6 +1726,16 @@ auto mount_root_partition(std::vector<gucc::fs::Partition>& partitions) noexcept
const auto& root_part_uuid = gucc::fs::utils::get_device_uuid(root_part_struct.device);
root_part_struct.uuid_str = root_part_uuid;
// get luks information about the current partition
const auto& luks_name = std::get<std::string>(config_data["LUKS_NAME"]);
const auto& luks_uuid = std::get<std::string>(config_data["LUKS_UUID"]);
if (!luks_name.empty()) {
root_part_struct.luks_mapper_name = luks_name;
}
if (!luks_uuid.empty()) {
root_part_struct.luks_uuid = luks_uuid;
}
utils::dump_partition_to_log(root_part_struct);
// insert root partition
@ -1884,8 +1894,10 @@ void mount_partitions() noexcept {
tui::mount_current_partition();
// utils::delete_partition_in_list(partition);
// TODO(vnepogodin): parse luks information
// get mountpoint
const auto& mountpoint_info = std::get<std::string>(config_data["MOUNTPOINT"]);
// get options used for mounting the current partition
const auto& mount_opts_info = std::get<std::string>(config_data["MOUNT_OPTS"]);
const auto& part_fs = gucc::fs::utils::get_mountpoint_fs(mountpoint_info);
@ -1894,6 +1906,16 @@ void mount_partitions() noexcept {
const auto& part_uuid = gucc::fs::utils::get_device_uuid(part_struct.device);
part_struct.uuid_str = part_uuid;
// get luks information about the current partition
const auto& luks_name = std::get<std::string>(config_data["LUKS_NAME"]);
const auto& luks_uuid = std::get<std::string>(config_data["LUKS_UUID"]);
if (!luks_name.empty()) {
part_struct.luks_mapper_name = luks_name;
}
if (!luks_uuid.empty()) {
part_struct.luks_uuid = luks_uuid;
}
utils::dump_partition_to_log(part_struct);
// insert root partition