From 7be21f53dd36a7691da6c6bef7460007164973a4 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 3 May 2024 22:52:24 +0200 Subject: [PATCH] pm/conf --- cd.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cd.sh b/cd.sh index 7fe0fd1..6d1a81f 100644 --- a/cd.sh +++ b/cd.sh @@ -70,6 +70,7 @@ cd_set_environment_variables () { CD_CMD_UPDATE="dnf makecache" CD_CMD_UPGRADE="dnf upgrade --assumeyes" CD_PKG_PKG="" + CD_PM_CONF_PATH="/etc/dnf/dnf.conf" CD_PM_HTTPS_PATH="/etc/dnf/dnf.conf.d/https.conf" CD_PM_HTTPS_TEXT="sslverify=False" CD_PYTHON_COMMAND="python3.11" @@ -91,6 +92,7 @@ cd_set_environment_variables () { CD_CMD_UPDATE="apt-get update" CD_CMD_UPGRADE="apt-get upgrade --assume-yes" CD_PKG_PKG="apt-utils" + CD_PM_CONF_PATH="/etc/apt/apt.conf.d/apt.conf" CD_PM_HTTPS_PATH="/etc/apt/apt.conf.d/https" CD_PM_HTTPS_TEXT="Acquire::https::Verify-Peer False;" CD_PYTHON_COMMAND="python3" @@ -180,7 +182,7 @@ cd_set_packages_configuration () { cd_step "Set packages configuration" case "${CD_OS_ID}" in "${CD_OS_ALMA}") - cd_write "/etc/dnf/dnf.conf" "\ + cd_write "${CD_PM_CONF_PATH}" "\ [main] best=True clean_requirements_on_remove=True @@ -190,7 +192,7 @@ skip_if_unavailable=False " ;; "${CD_OS_DEBIAN}") - cd_write "/etc/apt/apt.conf.d/apt.conf" "\ + cd_write "${CD_PM_CONF_PATH}" "\ Acquire::Check-Valid-Until True; APT::Get::Show-Versions True; APT::Install-Recommends False;