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

Update Base packages (#10)

Browse Source 
* add linux-firmware to base packages

* add man page to base packages

* add bcachefs tools to base packages
This commit is contained in:
mhk2012 2024-01-19 17:53:14 +00:00 committed by GitHub
parent cc6348f753
commit 9c6491deda
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/utils.cpp
View File

@ -733,9 +733,10 @@ auto get_pkglist_base(const std::string_view& packages) noexcept -> std::vector<
const auto& server_mode = std::get<std::int32_t>(config_data["SERVER_MODE"]); const auto& server_mode = std::get<std::int32_t>(config_data["SERVER_MODE"]);
const auto& mountpoint_info = std::get<std::string>(config_data["MOUNTPOINT"]); const auto& mountpoint_info = std::get<std::string>(config_data["MOUNTPOINT"]);
const auto& root_filesystem = utils::get_mountpoint_fs(mountpoint_info); const auto& root_filesystem = utils::get_mountpoint_fs(mountpoint_info);
const auto& is_root_on_zfs = (root_filesystem == "zfs"); const auto& is_root_on_zfs = (root_filesystem == "zfs");
const auto& is_root_on_btrfs = (root_filesystem == "btrfs"); const auto& is_root_on_btrfs = (root_filesystem == "btrfs");
const auto& is_root_on_bcachefs = (root_filesystem == "bcachefs");
auto pkg_list = utils::make_multiline(packages, false, ' '); auto pkg_list = utils::make_multiline(packages, false, ' ');
@ -750,6 +751,9 @@ auto get_pkglist_base(const std::string_view& packages) noexcept -> std::vector<
if (is_root_on_zfs) { if (is_root_on_zfs) {
pkg_list.insert(pkg_list.cend(), {"zfs-utils"}); pkg_list.insert(pkg_list.cend(), {"zfs-utils"});
} }
if (is_root_on_bcachefs) {
pkg_list.insert(pkg_list.cend(), {"bcachefs-tools"});
}
if (server_mode == 0) { if (server_mode == 0) {
if (is_root_on_btrfs) { if (is_root_on_btrfs) {
pkg_list.insert(pkg_list.cend(), {"snapper", "btrfs-assistant-git"}); pkg_list.insert(pkg_list.cend(), {"snapper", "btrfs-assistant-git"});
@ -765,7 +769,8 @@ auto get_pkglist_base(const std::string_view& packages) noexcept -> std::vector<
pkg_list.insert(pkg_list.cend(), {"duf", "fsarchiver", "hwinfo", "inxi", "fastfetch"}); pkg_list.insert(pkg_list.cend(), {"duf", "fsarchiver", "hwinfo", "inxi", "fastfetch"});
} }
pkg_list.insert(pkg_list.cend(), {"amd-ucode", "intel-ucode"}); pkg_list.insert(pkg_list.cend(), {"amd-ucode", "intel-ucode"});
pkg_list.insert(pkg_list.cend(), {"base", "base-devel", "mkinitcpio", "vim", "wget", "micro", "nano", "networkmanager", "openssh", "ripgrep", "sed", "rsync", "pacman-contrib", "paru", "btop"}); pkg_list.insert(pkg_list.cend(), {"base", "base-devel", "linux-firmware", "mkinitcpio", "vim", "wget", "micro", "nano", "networkmanager", "openssh", "ripgrep", "sed", "rsync", "pacman-contrib", "paru", "btop"});
pkg_list.insert(pkg_list.cend(), {"man-db", "less"});
pkg_list.insert(pkg_list.cend(), {"cachyos-mirrorlist", "cachyos-v3-mirrorlist", "cachyos-v4-mirrorlist", "cachyos-keyring"}); pkg_list.insert(pkg_list.cend(), {"cachyos-mirrorlist", "cachyos-v3-mirrorlist", "cachyos-v4-mirrorlist", "cachyos-keyring"});
return pkg_list; return pkg_list;