Clone/New-Cli-Installer
1
0
Fork 0
mirror of https://github.com/CachyOS/New-Cli-Installer.git synced 2025-02-02 22:07:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🧹 log slightly more information

Browse Source 
log information about system, running installer version
This commit is contained in:
Vladislav Nepogodin 2022-12-09 02:57:01 +04:00
parent 7046468ddb
commit 5dc6d56bcc
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/utils.cpp
View File

@ -550,6 +550,8 @@ void find_partitions() noexcept {
static constexpr auto other_piece = "sed 's/part$/\\/dev\\//g' | sed 's/lvm$\\|crypt$/\\/dev\\/mapper\\//g' | awk '{print $3$1 \" \" $2}' | awk '!/mapper/{a[++i]=$0;next}1;END{while(x<length(a))print a[++x]}' ; zfs list -Ht volume -o name,volsize 2>/dev/null | awk '{printf \"/dev/zvol/%s %s\\n\", $1, $2}'";
const auto& partitions_tmp = utils::exec(fmt::format(FMT_COMPILE("lsblk -lno NAME,SIZE,TYPE | grep '{}' | {}"), include_part, other_piece));
spdlog::info("found partitions:\n{}", partitions_tmp);
// create a raid partition list
// old_ifs="$IFS"
// IFS=$'\n'
@ -1644,6 +1646,13 @@ vm.vfs_cache_pressure = 50
bool parse_config() noexcept {
using namespace rapidjson;
auto* config_instance = Config::instance();
auto& config_data = config_instance->data();
spdlog::info("CachyOS installer version '{}'", INSTALLER_VERSION);
const auto& system_info = std::get<std::string>(config_data["SYSTEM"]);
spdlog::info("SYSTEM: '{}'", system_info);
// 1. Open file for reading.
static constexpr auto file_path = "settings.json";
std::ifstream ifs{file_path};
@ -1664,8 +1673,6 @@ bool parse_config() noexcept {
assert(doc.HasMember("menus"));
assert(doc["menus"].IsInt());
auto* config_instance = Config::instance();
auto& config_data = config_instance->data();
config_data["menus"] = doc["menus"].GetInt();
auto& headless_mode = std::get<std::int32_t>(config_data["HEADLESS_MODE"]);