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

🧹 cleanup; move generic functions to utils

Browse Source
This commit is contained in:
Vladislav Nepogodin 2023-02-01 04:14:28 +04:00
parent 577c2920b9
commit 180001be13
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
5 changed files with 91 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/simple_tui.cpp
View File

@ -125,10 +125,10 @@ void menu_simple() noexcept {
tui::select_device();
}
tui::auto_partition(false);
utils::auto_partition();
// LVM Detection. If detected, activate.
tui::lvm_detect();
utils::lvm_detect();
// Ensure partitions are unmounted (i.e. where mounted previously)
config_data["INCLUDE_PART"] = "part\\|lvm\\|crypt";

60
src/tui.cpp
View File

@ -219,11 +219,11 @@ void set_xkbmap() noexcept {
void select_keymap() noexcept {
auto* config_instance = Config::instance();
auto& config_data = config_instance->data();
auto& keymap = std::get<std::string>(config_data["KEYMAP"]);
const auto& current_keymap = std::get<std::string>(config_data["KEYMAP"]);
// does user want to change the default settings?
static constexpr auto default_keymap = "Currently configured keymap setting is:";
const auto& content = fmt::format(FMT_COMPILE("\n {}\n \n[ {} ]\n"), default_keymap, keymap);
static constexpr auto default_keymap_msg = "Currently configured keymap setting is:";
const auto& content = fmt::format(FMT_COMPILE("\n {}\n \n[ {} ]\n"), default_keymap_msg, current_keymap);
const auto& keep_default = detail::yesno_widget(content, size(HEIGHT, LESS_THAN, 15) | size(WIDTH, LESS_THAN, 75));
/* clang-format off */
if (!keep_default) { return; }
@ -234,7 +234,8 @@ void select_keymap() noexcept {
auto screen = ScreenInteractive::Fullscreen();
std::int32_t selected{226};
auto ok_callback = [&] {
keymap = keymaps[static_cast<std::size_t>(selected)];
const auto& selected_keymap = keymaps[static_cast<std::size_t>(selected)];
utils::set_keymap(selected_keymap);
screen.ExitLoopClosure()();
};
static constexpr auto vc_keymap_body = "\nA virtual console is a shell prompt in a non-graphical environment.\nIts keymap is independent of a desktop environment / terminal.\n";
@ -846,48 +847,14 @@ void install_bootloader() noexcept {
}
// BIOS and UEFI
void auto_partition(bool interactive) noexcept {
void auto_partition() noexcept {
auto* config_instance = Config::instance();
auto& config_data = config_instance->data();
const auto& device_info = std::get<std::string>(config_data["DEVICE"]);
[[maybe_unused]] const auto& system_info = std::get<std::string>(config_data["SYSTEM"]);
#ifdef NDEVENV
// Find existing partitions (if any) to remove
const auto& parts = utils::exec(fmt::format(FMT_COMPILE("parted -s {} print | {}"), device_info, "awk '/^ / {print $1}'"));
const auto& del_parts = utils::make_multiline(parts);
for (const auto& del_part : del_parts) {
utils::exec(fmt::format(FMT_COMPILE("parted -s {} rm {} 2>>/tmp/cachyos-install.log &>/dev/null"), device_info, del_part));
}
// Clear disk
utils::exec(fmt::format(FMT_COMPILE("dd if=/dev/zero of=\"{}\" bs=512 count=1 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
utils::exec(fmt::format(FMT_COMPILE("wipefs -af \"{}\" 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
utils::exec(fmt::format(FMT_COMPILE("sgdisk -Zo \"{}\" 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
// Identify the partition table
const auto& part_table = utils::exec(fmt::format(FMT_COMPILE("parted -s {} print 2>/dev/null | grep -i 'partition table' | {}"), device_info, "awk '{print $3}'"));
// Create partition table if one does not already exist
if ((system_info == "BIOS") && (part_table != "msdos"))
utils::exec(fmt::format(FMT_COMPILE("parted -s {} mklabel msdos 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
if ((system_info == "UEFI") && (part_table != "gpt"))
utils::exec(fmt::format(FMT_COMPILE("parted -s {} mklabel gpt 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
// Create partitions (same basic partitioning scheme for BIOS and UEFI)
if (system_info == "BIOS")
utils::exec(fmt::format(FMT_COMPILE("parted -s {} mkpart primary ext3 1MiB 513MiB 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
else
utils::exec(fmt::format(FMT_COMPILE("parted -s {} mkpart ESP fat32 1MiB 513MiB 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
utils::exec(fmt::format(FMT_COMPILE("parted -s {} set 1 boot on 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
utils::exec(fmt::format(FMT_COMPILE("parted -s {} mkpart primary ext3 513MiB 100% 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
#endif
/* clang-format off */
if (!interactive) { return; }
/* clang-format on */
utils::auto_partition();
// Show created partitions
const auto& disk_list = utils::exec(fmt::format(FMT_COMPILE("lsblk {} -o NAME,TYPE,FSTYPE,SIZE"), device_info));
@ -1273,19 +1240,10 @@ void make_swap() noexcept {
}
void lvm_detect() noexcept {
const auto& lvm_pv = utils::exec("pvs -o pv_name --noheading 2>/dev/null");
const auto& lvm_vg = utils::exec("vgs -o vg_name --noheading 2>/dev/null");
const auto& lvm_lv = utils::exec("lvs -o vg_name,lv_name --noheading --separator - 2>/dev/null");
if ((lvm_lv != "") && (lvm_vg != "") && (lvm_pv != "")) {
utils::lvm_detect([] {
detail::infobox_widget("\nExisting Logical Volume Management (LVM) detected.\nActivating. Please Wait...\n");
std::this_thread::sleep_for(std::chrono::seconds(2));
#ifdef NDEVENV
utils::exec("modprobe dm-mod");
utils::exec("vgscan >/dev/null 2>&1");
utils::exec("vgchange -ay >/dev/null 2>&1");
#endif
}
});
}
void lvm_del_vg() noexcept {

2
src/tui.hpp
View File

@ -12,7 +12,7 @@ void set_root_password() noexcept;
void mount_opts(bool force = false) noexcept;
void lvm_detect() noexcept;
bool mount_current_partition(bool force = false) noexcept;
void auto_partition(bool interactive = true) noexcept;
void auto_partition() noexcept;
void create_partitions() noexcept;
bool select_device() noexcept;
void install_base() noexcept;

71
src/utils.cpp
View File

@ -352,6 +352,49 @@ void umount_partitions() noexcept {
}
}
// BIOS and UEFI
void auto_partition() noexcept {
auto* config_instance = Config::instance();
auto& config_data = config_instance->data();
const auto& device_info = std::get<std::string>(config_data["DEVICE"]);
[[maybe_unused]] const auto& system_info = std::get<std::string>(config_data["SYSTEM"]);
#ifdef NDEVENV
// Find existing partitions (if any) to remove
const auto& parts = utils::exec(fmt::format(FMT_COMPILE("parted -s {} print | {}"), device_info, "awk '/^ / {print $1}'"));
const auto& del_parts = utils::make_multiline(parts);
for (const auto& del_part : del_parts) {
utils::exec(fmt::format(FMT_COMPILE("parted -s {} rm {} 2>>/tmp/cachyos-install.log &>/dev/null"), device_info, del_part));
}
// Clear disk
utils::exec(fmt::format(FMT_COMPILE("dd if=/dev/zero of=\"{}\" bs=512 count=1 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
utils::exec(fmt::format(FMT_COMPILE("wipefs -af \"{}\" 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
utils::exec(fmt::format(FMT_COMPILE("sgdisk -Zo \"{}\" 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
// Identify the partition table
const auto& part_table = utils::exec(fmt::format(FMT_COMPILE("parted -s {} print 2>/dev/null | grep -i 'partition table' | {}"), device_info, "awk '{print $3}'"));
// Create partition table if one does not already exist
if ((system_info == "BIOS") && (part_table != "msdos"))
utils::exec(fmt::format(FMT_COMPILE("parted -s {} mklabel msdos 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
if ((system_info == "UEFI") && (part_table != "gpt"))
utils::exec(fmt::format(FMT_COMPILE("parted -s {} mklabel gpt 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
// Create partitions (same basic partitioning scheme for BIOS and UEFI)
if (system_info == "BIOS")
utils::exec(fmt::format(FMT_COMPILE("parted -s {} mkpart primary ext3 1MiB 513MiB 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
else
utils::exec(fmt::format(FMT_COMPILE("parted -s {} mkpart ESP fat32 1MiB 513MiB 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
utils::exec(fmt::format(FMT_COMPILE("parted -s {} set 1 boot on 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
utils::exec(fmt::format(FMT_COMPILE("parted -s {} mkpart primary ext3 513MiB 100% 2>>/tmp/cachyos-install.log &>/dev/null"), device_info));
#else
spdlog::info("lsblk {} -o NAME,TYPE,FSTYPE,SIZE", device_info);
#endif
}
// Securely destroy all data on a given device.
void secure_wipe() noexcept {
auto* config_instance = Config::instance();
@ -460,6 +503,14 @@ void set_xkbmap(const std::string_view& xkbmap) noexcept {
#endif
}
void set_keymap(const std::string_view& selected_keymap) noexcept {
auto* config_instance = Config::instance();
auto& config_data = config_instance->data();
config_data["KEYMAP"] = std::string{selected_keymap};
spdlog::info("Selected keymap: {}", selected_keymap);
}
void set_timezone(const std::string_view& timezone) noexcept {
spdlog::info("Timezone is set to {}", timezone);
#ifdef NDEVENV
@ -600,6 +651,26 @@ void find_partitions() noexcept {
}
}
void lvm_detect(std::optional<std::function<void()>> func_callback) noexcept {
const auto& lvm_pv = utils::exec("pvs -o pv_name --noheading 2>/dev/null");
const auto& lvm_vg = utils::exec("vgs -o vg_name --noheading 2>/dev/null");
const auto& lvm_lv = utils::exec("lvs -o vg_name,lv_name --noheading --separator - 2>/dev/null");
if (!((lvm_lv != "") && (lvm_vg != "") && (lvm_pv != ""))) {
return;
}
if (func_callback.has_value()) {
func_callback.value()();
}
#ifdef NDEVENV
utils::exec("modprobe dm-mod");
utils::exec("vgscan >/dev/null 2>&1");
utils::exec("vgchange -ay >/dev/null 2>&1");
#endif
}
auto get_pkglist_base(const std::string_view& packages) noexcept -> std::vector<std::string> {
auto* config_instance = Config::instance();
auto& config_data = config_instance->data();

5
src/utils.hpp
View File

@ -5,6 +5,8 @@
#include "subprocess.h"
#include <charconv> // for from_chars
#include <functional> // for function
#include <optional> // for optional
#include <string> // for string
#include <string_view> // for string_view
#include <vector> // for vector
@ -20,10 +22,12 @@ void clear_screen() noexcept;
[[nodiscard]] auto make_multiline(const std::vector<std::string>& multiline, bool reverse = false, const std::string_view&& delim = "\n") noexcept -> std::string;
void inst_needed(const std::string_view& pkg) noexcept;
void secure_wipe() noexcept;
void auto_partition() noexcept;
void generate_fstab(const std::string_view& fstab_cmd) noexcept;
void set_hostname(const std::string_view& hostname) noexcept;
void set_locale(const std::string_view& locale) noexcept;
void set_xkbmap(const std::string_view& xkbmap) noexcept;
void set_keymap(const std::string_view& keymap) noexcept;
void set_timezone(const std::string_view& timezone) noexcept;
void set_hw_clock(const std::string_view& clock_type) noexcept;
void create_new_user(const std::string_view& user, const std::string_view& password, const std::string_view& shell) noexcept;
@ -33,6 +37,7 @@ void set_root_password(const std::string_view& password) noexcept;
[[nodiscard]] std::string list_mounted() noexcept;
[[nodiscard]] std::string list_containing_crypt() noexcept;
[[nodiscard]] std::string list_non_crypt() noexcept;
void lvm_detect(std::optional<std::function<void()>> func_callback = std::nullopt) noexcept;
void umount_partitions() noexcept;
void find_partitions() noexcept;