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

🧹 move btrfs subvolumes mount logic into gucc

Browse Source
This commit is contained in:
Vladislav Nepogodin 2024-06-27 18:44:17 +04:00
parent 9e011fc276
commit 97be1f3fc4
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
4 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gucc/include/gucc/btrfs.hpp
View File

@ -1,14 +1,15 @@
#ifndef BTRFS_HPP
#define BTRFS_HPP
#include <string> // for string
#include <string_view> // for string_view
#include <vector> // for vector
namespace gucc::fs {
struct BtrfsSubvolume final {
std::string_view subvolume;
std::string_view mountpoint;
std::string subvolume;
std::string mountpoint;
};
// Creates btrfs subvolume
@ -17,6 +18,9 @@ auto btrfs_create_subvol(std::string_view subvolume, std::string_view root_mount
// Creates btrfs subvolumes and mounts them
auto btrfs_create_subvols(const std::vector<BtrfsSubvolume>& subvols, std::string_view device, std::string_view root_mountpoint, std::string_view mount_opts) noexcept -> bool;
// Mounts btrfs subvolumes
auto btrfs_mount_subvols(const std::vector<BtrfsSubvolume>& subvols, std::string_view device, std::string_view root_mountpoint, std::string_view mount_opts) noexcept -> bool;
} // namespace gucc::fs
#endif // BTRFS_HPP

10
gucc/src/btrfs.cpp
View File

@ -52,9 +52,17 @@ auto btrfs_create_subvols(const std::vector<BtrfsSubvolume>& subvols, std::strin
}
}
// TODO(vnepogodin): handle exit code
utils::exec(fmt::format(FMT_COMPILE("umount -v {} &>>/tmp/cachyos-install.log"), root_mountpoint));
utils::exec(fmt::format(FMT_COMPILE("umount -v {} &>>/tmp/cachyos-install.log"), root_mountpoint), true);
// Mount subvolumes
if (!fs::btrfs_mount_subvols(subvols, device, root_mountpoint, mount_opts)) {
spdlog::error("Failed to mount btrfs subvolumes");
return false;
}
return true;
}
auto btrfs_mount_subvols(const std::vector<BtrfsSubvolume>& subvols, std::string_view device, std::string_view root_mountpoint, std::string_view mount_opts) noexcept -> bool {
for (const auto& subvol : subvols) {
auto mount_option = fmt::format(FMT_COMPILE("subvol={},{}"), subvol.subvolume, mount_opts);
if (subvol.subvolume.empty()) {

2
gucc/src/cpu.cpp
View File

@ -116,7 +116,7 @@ auto get_isa_levels() noexcept -> std::vector<std::string> {
std::vector<std::string> supported_isa_levels;
{
struct utsname un{};
struct utsname un { };
uname(&un);
supported_isa_levels.emplace_back(un.machine);
}

39
src/disk.cpp
View File

@ -20,6 +20,7 @@
#include <fmt/core.h>
using namespace std::string_view_literals;
using namespace std::string_literals;
namespace fs = std::filesystem;
namespace utils {
@ -81,9 +82,9 @@ void btrfs_create_subvols([[maybe_unused]] const disk_part& disk, const std::str
// Create subvolumes automatically
const std::vector<gucc::fs::BtrfsSubvolume> subvolumes{
gucc::fs::BtrfsSubvolume{.subvolume = "/@"sv, .mountpoint = "/"sv},
gucc::fs::BtrfsSubvolume{.subvolume = "/@home"sv, .mountpoint = "/home"sv},
gucc::fs::BtrfsSubvolume{.subvolume = "/@cache"sv, .mountpoint = "/var/cache"sv},
gucc::fs::BtrfsSubvolume{.subvolume = "/@"s, .mountpoint = "/"s},
gucc::fs::BtrfsSubvolume{.subvolume = "/@home"s, .mountpoint = "/home"s},
gucc::fs::BtrfsSubvolume{.subvolume = "/@cache"s, .mountpoint = "/var/cache"s},
// gucc::fs::BtrfsSubvolume{.subvolume = "/@snapshots"sv, .mountpoint = "/.snapshots"sv},
};
if (!gucc::fs::btrfs_create_subvols(subvolumes, disk.root, root_mountpoint, disk.mount_opts)) {
@ -106,23 +107,33 @@ void mount_existing_subvols(const disk_part& disk) noexcept {
fs_opts = "compress=lzo,noatime,space_cache,ssd,commit=120"sv;
}
#ifdef NDEVENV
gucc::utils::exec("btrfs subvolume list /mnt 2>/dev/null | cut -d' ' -f9 > /tmp/.subvols"sv, true);
umount("/mnt");
const auto root_mountpoint = "/mnt"sv;
// Mount subvolumes one by one
for (const auto& subvol : gucc::utils::make_multiline(gucc::utils::exec("cat /tmp/.subvols"sv))) {
gucc::utils::exec(fmt::format(FMT_COMPILE("btrfs subvolume list {} 2>/dev/null | cut -d' ' -f9 > /tmp/.subvols"), root_mountpoint), true);
if (gucc::utils::exec(fmt::format(FMT_COMPILE("umount -v {} &>>/tmp/cachyos-install.log"), root_mountpoint), true) != "0") {
spdlog::error("Failed to unmount {}", root_mountpoint);
}
const auto& subvol_list = gucc::utils::make_multiline(gucc::utils::exec("cat /tmp/.subvols"sv));
// Get mountpoints of subvolumes
std::vector<gucc::fs::BtrfsSubvolume> subvolumes{};
for (auto&& subvol : subvol_list) {
// Ask for mountpoint
const auto& content = fmt::format(FMT_COMPILE("\nInput mountpoint of\nthe subvolume {}\nas it would appear\nin installed system\n(without prepending /mnt).\n"), subvol);
const auto& content = fmt::format(FMT_COMPILE("\nInput mountpoint of\nthe subvolume {}\nas it would appear\nin installed system\n(without prepending {}).\n"), subvol, root_mountpoint);
std::string mountpoint{"/"};
if (!tui::detail::inputbox_widget(mountpoint, content, size(ftxui::HEIGHT, ftxui::LESS_THAN, 9) | size(ftxui::WIDTH, ftxui::LESS_THAN, 30))) {
return;
}
const auto& mount_dir{fmt::format(FMT_COMPILE("/mnt/{}"), mountpoint)};
if (!fs::exists(mount_dir)) {
fs::create_directories(mount_dir);
}
// Mount the subvolume
gucc::utils::exec(fmt::format(FMT_COMPILE("mount -o \"{},subvol={}\" \"{}\" \"{}\""), fs_opts, subvol, disk.root, mount_dir));
subvolumes.push_back(gucc::fs::BtrfsSubvolume{.subvolume = subvol, .mountpoint = mountpoint});
}
// TODO(vnepogodin): add confirmation for selected mountpoint for particular subvolume
// Mount subvolumes
if (!gucc::fs::btrfs_mount_subvols(subvolumes, disk.root, root_mountpoint, fs_opts)) {
spdlog::error("Failed to mount btrfs subvolumes");
}
#endif
}