From 4971424959547b69f17b1376542dc687c2e7281d Mon Sep 17 00:00:00 2001 From: teldra Date: Tue, 16 Mar 2021 23:17:22 +0100 Subject: [PATCH] small fixes --- modules/20-installation/install | 10 ---------- modules/20-installation/preinstall | 11 +++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/modules/20-installation/install b/modules/20-installation/install index 65a6524..d53ef67 100644 --- a/modules/20-installation/install +++ b/modules/20-installation/install @@ -1,15 +1,5 @@ module start "installation" "Installation" "dontcheck" -if [[ "${#ignorepkg[@]}" -gt 0 ]]; then - mkdir -p /etc/xbps.d/ - touch /etc/xbps.d/10-ignore-pkg.conf - for ig in "${ignorepkg[@]}"; do - if ! grep -q "${ig}" /etc/xbps.d/10-ignore-pkg.conf; then - echo "ignorepkg=${ig}" >> /etc/xbps.d/10-ignore-pkg.conf - fi - done -fi - for i in ${pkg[@]}; do for j in ${removepkg[@]}; do if [[ "${i}" == "${j}" ]]; then diff --git a/modules/20-installation/preinstall b/modules/20-installation/preinstall index d353361..588c846 100644 --- a/modules/20-installation/preinstall +++ b/modules/20-installation/preinstall @@ -1,5 +1,16 @@ module start "preinstallation" "Preinstallation" +if [[ "${#ignorepkg[@]}" -gt 0 ]]; then + mkdir -p /etc/xbps.d/ + touch /etc/xbps.d/10-ignore-pkg.conf + for ig in "${ignorepkg[@]}"; do + if ! grep -q "${ig}" "${dest}"/etc/xbps.d/10-ignore-pkg.conf; then + echo "ignorepkg=${ig}" >> "${dest}"/etc/xbps.d/10-ignore-pkg.conf + fi + done +fi + + mkdir -p "${dest}"/var/db/xbps cp -rf /var/db/xbps/keys/ "${dest}"/var/db/xbps