community-scripts/ProxmoxVED
5
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1312 from bandogora/which-tar-rpm

Browse Source 
Make sure `which` and `tar` are installed for RHEL-based OSs
This commit is contained in:
CanbiZ (MickLesk) 2026-01-19 09:31:54 +01:00 committed by GitHub
commit 33f4b256cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc/build.func
View File

@ -3286,7 +3286,7 @@ EOF'
fi fi
# Build package list - EL10+ may not have glibc-langpack-en in same form # Build package list - EL10+ may not have glibc-langpack-en in same form
local rhel_packages="curl sudo mc jq procps-ng ncurses" local rhel_packages="curl sudo mc jq which tar procps-ng ncurses"
if [[ "$rhel_version" -lt 10 ]]; then if [[ "$rhel_version" -lt 10 ]]; then
rhel_packages="$rhel_packages glibc-langpack-en" rhel_packages="$rhel_packages glibc-langpack-en"
else else
@ -3298,12 +3298,12 @@ EOF'
local install_log="/tmp/dnf_install_${CTID}.log" local install_log="/tmp/dnf_install_${CTID}.log"
if ! pct exec "$CTID" -- bash -c "dnf install -y $rhel_packages 2>&1 | tee $install_log; exit \${PIPESTATUS[0]}" >/dev/null 2>&1; then if ! pct exec "$CTID" -- bash -c "dnf install -y $rhel_packages 2>&1 | tee $install_log; exit \${PIPESTATUS[0]}" >/dev/null 2>&1; then
# Check if it's just missing optional packages # Check if it's just missing optional packages
if pct exec "$CTID" -- bash -c "rpm -q curl sudo mc jq procps-ng" >/dev/null 2>&1; then if pct exec "$CTID" -- bash -c "rpm -q curl sudo mc jq which tar procps-ng" >/dev/null 2>&1; then
msg_warn "Some optional packages may have failed, but core packages installed" msg_warn "Some optional packages may have failed, but core packages installed"
else else
# Real failure - try minimal install # Real failure - try minimal install
msg_warn "Full package install failed, trying minimal set..." msg_warn "Full package install failed, trying minimal set..."
if ! pct exec "$CTID" -- bash -c "dnf install -y curl sudo jq 2>&1" >/dev/null 2>&1; then if ! pct exec "$CTID" -- bash -c "dnf install -y curl sudo jq which tar 2>&1" >/dev/null 2>&1; then
msg_error "dnf/yum base packages installation failed" msg_error "dnf/yum base packages installation failed"
pct exec "$CTID" -- bash -c "cat $install_log 2>/dev/null" || true pct exec "$CTID" -- bash -c "cat $install_log 2>/dev/null" || true
exit 1 exit 1