Skip to content

Commit

Permalink
🚧 utils: fix for DEVENV OFF
Browse files Browse the repository at this point in the history
  • Loading branch information
vnepogodin committed Jun 25, 2024
1 parent 16e759e commit 2e1e4fa
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -933,7 +933,7 @@ void install_base(const std::string_view& packages) noexcept {
const auto& zfs = std::get<std::int32_t>(config_data["ZFS"]);

const auto& initcpio_filename = fmt::format(FMT_COMPILE("{}/etc/mkinitcpio.conf"), mountpoint);
auto initcpio = detail::Initcpio{initcpio_filename};
auto initcpio = gucc::detail::Initcpio{initcpio_filename};

// NOTE: make sure that we have valid initcpio config,
// overwise we will end up here with unbootable system.
Expand Down Expand Up @@ -1181,7 +1181,7 @@ void install_refind() noexcept {
utils::exec("refind-install --root /mnt --alldrivers --yes &>>/tmp/cachyos-install.log");

const auto& initcpio_filename = fmt::format(FMT_COMPILE("{}/etc/mkinitcpio.conf"), mountpoint);
auto initcpio = detail::Initcpio{initcpio_filename};
auto initcpio = gucc::detail::Initcpio{initcpio_filename};

// Remove autodetect hook
initcpio.remove_hook("autodetect");
Expand Down Expand Up @@ -1269,7 +1269,7 @@ void install_systemd_boot() noexcept {
if (utils::to_int(removable.data()) == 1) {
const auto& mountpoint = std::get<std::string>(config_data["MOUNTPOINT"]);
const auto& initcpio_filename = fmt::format(FMT_COMPILE("{}/etc/mkinitcpio.conf"), mountpoint);
auto initcpio = detail::Initcpio{initcpio_filename};
auto initcpio = gucc::detail::Initcpio{initcpio_filename};

// Remove autodetect hook
initcpio.remove_hook("autodetect");
Expand Down Expand Up @@ -1716,7 +1716,7 @@ void install_cachyos_repo() noexcept {
return;
}

detail::pacmanconf::push_repos_front(pacman_conf_cachyos, repos_data);
gucc::detail::pacmanconf::push_repos_front(pacman_conf_cachyos, repos_data);

spdlog::info("backup old config");
fs::rename(pacman_conf, pacman_conf_path_backup, err);
Expand Down

0 comments on commit 2e1e4fa

Please sign in to comment.