diff --git a/scripts/global/update-pve.sh b/scripts/global/update-pve.sh index ee447dd..d0ca7b1 100644 --- a/scripts/global/update-pve.sh +++ b/scripts/global/update-pve.sh @@ -1,6 +1,6 @@ #!/bin/bash # ========================================================== -# Universal Proxmox VE Update Script +# Proxmox VE Update Script # ========================================================== # Configuration @@ -17,7 +17,6 @@ fi load_language initialize_cache - ensure_tools_json() { [ -f "$TOOLS_JSON" ] || echo "{}" > "$TOOLS_JSON" } @@ -29,35 +28,32 @@ register_tool() { jq --arg t "$tool" --argjson v "$state" '.[$t]=$v' "$TOOLS_JSON" > "$TOOLS_JSON.tmp" && mv "$TOOLS_JSON.tmp" "$TOOLS_JSON" } - download_common_functions() { if ! source <(curl -s "$REPO_URL/scripts/global/common-functions.sh"); then return 1 fi } -update_proxmox() { +update_pve9() { local start_time=$(date +%s) local log_file="/var/log/proxmox-update-$(date +%Y%m%d-%H%M%S).log" + local changes_made=false + local OS_CODENAME="$(grep "VERSION_CODENAME=" /etc/os-release | cut -d"=" -f 2 | xargs)" + local TARGET_CODENAME="trixie" + if [ -z "$OS_CODENAME" ]; then + OS_CODENAME=$(lsb_release -cs 2>/dev/null || echo "trixie") + fi download_common_functions - - local pve_info=$(get_pve_info) - local pve_full_version=$(echo "$pve_info" | cut -d'|' -f1) - local pve_major=$(echo "$pve_info" | cut -d'|' -f2) - local current_codename=$(echo "$pve_info" | cut -d'|' -f3) - local target_codename=$(echo "$pve_info" | cut -d'|' -f4) - clear show_proxmenux_logo echo -e - msg_title "$(translate "Proxmox VE ${pve_major}.x System Update")" - msg_info2 "$(translate "Detected: Proxmox VE ${pve_major}.x (Current: $current_codename, Target: $target_codename)")" + msg_title "$(translate "Proxmox VE System Update")" + msg_info2 "$(translate "Detected: Proxmox VE 9.x (Current: $OS_CODENAME, Target: $TARGET_CODENAME)")" echo - local available_space=$(df /var/cache/apt/archives | awk 'NR==2 {print int($4/1024)}') if [ "$available_space" -lt 1024 ]; then msg_error "$(translate "Insufficient disk space. Available: ${available_space}MB")" @@ -76,11 +72,77 @@ update_proxmox() { fi - local changes_made=$(configure_repositories "$pve_major" "$current_codename" "$target_codename") - + disable_sources_repo() { + local file="$1" + if [[ -f "$file" ]] && grep -q "^Enabled: *true" "$file"; then + sed -i 's/^Enabled: *true/Enabled: false/' "$file" + return 0 + fi + return 1 + } - cleanup_duplicate_repos "$target_codename" + if disable_sources_repo "/etc/apt/sources.list.d/pve-enterprise.sources"; then + msg_ok "$(translate "Enterprise Proxmox repository disabled")" + changes_made=true + fi + + if disable_sources_repo "/etc/apt/sources.list.d/ceph.sources"; then + msg_ok "$(translate "Enterprise Proxmox Ceph repository disabled")" + changes_made=true + fi + + + [ -f /etc/apt/sources.list.d/pve-public-repo.list ] && rm -f /etc/apt/sources.list.d/pve-public-repo.list + [ -f /etc/apt/sources.list.d/pve-install-repo.list ] && rm -f /etc/apt/sources.list.d/pve-install-repo.list + + +msg_info "$(translate "Creating Proxmox VE 9.x no-subscription repository...")" +cat > /etc/apt/sources.list.d/proxmox.sources << EOF +Enabled: true +Types: deb +URIs: http://download.proxmox.com/debian/pve +Suites: ${TARGET_CODENAME} +Components: pve-no-subscription +Signed-By: /usr/share/keyrings/proxmox-archive-keyring.gpg +EOF + msg_ok "$(translate "Proxmox VE 9.x no-subscription repository created")" + changes_made=true + + + local sources_file="/etc/apt/sources.list" + cp "$sources_file" "${sources_file}.backup.$(date +%Y%m%d_%H%M%S)" + + + sed -i 's|ftp.es.debian.org|deb.debian.org|g' "$sources_file" + + + if [ "$OS_CODENAME" != "$TARGET_CODENAME" ]; then + msg_info "$(translate "Updating Debian repositories from $OS_CODENAME to $TARGET_CODENAME...")" + sed -i 's/bookworm/trixie/g' "$sources_file" + sed -i "s/$OS_CODENAME/$TARGET_CODENAME/g" "$sources_file" + changes_made=true + fi + + +cat > "$sources_file" << EOF +# Debian ${TARGET_CODENAME} repositories +deb http://deb.debian.org/debian ${TARGET_CODENAME} main contrib non-free non-free-firmware +deb http://deb.debian.org/debian ${TARGET_CODENAME}-updates main contrib non-free non-free-firmware +deb http://security.debian.org/debian-security ${TARGET_CODENAME}-security main contrib non-free non-free-firmware +EOF + + + msg_ok "$(translate "Debian repositories configured for $TARGET_CODENAME")" + + local firmware_conf="/etc/apt/apt.conf.d/no-firmware-warnings.conf" + if [ ! -f "$firmware_conf" ]; then + msg_info "$(translate "Disabling non-free firmware warnings...")" + echo 'APT::Get::Update::SourceListWarnings::NonFreeFirmware "false";' > "$firmware_conf" + msg_ok "$(translate "Non-free firmware warnings disabled")" + fi + + cleanup_duplicate_repos msg_info "$(translate "Updating package lists...")" update_output=$(apt-get update 2>&1) @@ -95,53 +157,83 @@ update_proxmox() { if apt-get update > "$log_file" 2>&1; then msg_ok "$(translate "Package lists updated after GPG fix")" else - msg_error "$(translate "Failed to update package lists")" + msg_error "$(translate "Failed to update package lists. Check log: $log_file")" return 1 fi + elif echo "$update_output" | grep -q "404\|Failed to fetch"; then + msg_warn "$(translate "Some repositories are not available, continuing with available ones...")" else - msg_error "$(translate "Failed to update package lists")" + msg_error "$(translate "Failed to update package lists. Check log: $log_file")" + echo "Error details: $update_output" return 1 fi fi - if [ "$pve_major" -ge 9 ] 2>/dev/null; then - msg_info "$(translate "Verifying Proxmox VE ${pve_major}.x repositories...")" - if apt policy 2>/dev/null | grep -q "${target_codename}.*pve-no-subscription"; then - msg_ok "$(translate "Proxmox VE ${pve_major}.x repositories verified")" - else - msg_warn "$(translate "Proxmox VE ${pve_major}.x repositories verification inconclusive, continuing...")" - fi + msg_info "$(translate "Verifying Proxmox VE 9.x repositories...")" + if apt policy 2>/dev/null | grep -q "${TARGET_CODENAME}.*pve-no-subscription"; then + msg_ok "$(translate "Proxmox VE 9.x repositories verified")" + else + msg_warn "$(translate "Proxmox VE 9.x repositories verification inconclusive, continuing...")" fi - - local available_pve_version=$(get_available_pve_version) + local current_pve_version=$(pveversion 2>/dev/null | grep -oP 'pve-manager/\K[0-9]+\.[0-9]+\.[0-9]+' | head -1) + local available_pve_version=$(apt-cache policy pve-manager 2>/dev/null | grep -oP 'Candidate: \K[0-9]+\.[0-9]+\.[0-9]+' | head -1) local upgradable=$(apt list --upgradable 2>/dev/null | grep -c "upgradable") local security_updates=$(apt list --upgradable 2>/dev/null | grep -c "security") + show_update_menu() { + local current_version="$1" + local target_version="$2" + local upgradable_count="$3" + local security_count="$4" - if ! show_update_menu "$pve_major" "$pve_full_version" "$available_pve_version" "$upgradable" "$security_updates"; then + local menu_text="$(translate "System Update Information")\n\n" + menu_text+="$(translate "Current PVE Version"): $current_version\n" + if [ -n "$target_version" ] && [ "$target_version" != "$current_version" ]; then + menu_text+="$(translate "Available PVE Version"): $target_version\n" + fi + menu_text+="\n$(translate "Package Updates Available"): $upgradable_count\n" + menu_text+="$(translate "Security Updates"): $security_count\n\n" + + if [ "$upgradable_count" -eq 0 ]; then + menu_text+="$(translate "System is already up to date")" + whiptail --title "$(translate "Update Status")" --msgbox "$menu_text" 15 70 + return 2 + else + menu_text+="$(translate "Do you want to proceed with the system update?")" + if whiptail --title "$(translate "Proxmox Update")" --yesno "$menu_text" 18 70; then + return 0 + else + return 1 + fi + fi + } + + show_update_menu "$current_pve_version" "$available_pve_version" "$upgradable" "$security_updates" + MENU_RESULT=$? + + if [[ $MENU_RESULT -eq 1 ]]; then msg_info2 "$(translate "Update cancelled by user")" - perform_final_cleanup - echo -e - msg_success "$(translate "Press Enter to return to menu...")" - read -r + apt-get -y autoremove > /dev/null 2>&1 || true + apt-get -y autoclean > /dev/null 2>&1 || true + return 0 + elif [[ $MENU_RESULT -eq 2 ]]; then + msg_ok "$(translate "System is already up to date. No update needed.")" + apt-get -y autoremove > /dev/null 2>&1 || true + apt-get -y autoclean > /dev/null 2>&1 || true return 0 fi - msg_info "$(translate "Removing conflicting utilities...")" - local conflicting_packages=$(dpkg -l 2>/dev/null | grep -E "^ii.*(ntp|openntpd|systemd-timesyncd)" | awk '{print $2}') - if [ -n "$conflicting_packages" ]; then - DEBIAN_FRONTEND=noninteractive apt-get -y purge $conflicting_packages >> "$log_file" 2>&1 + if /usr/bin/env DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::='--force-confdef' purge ntp openntpd systemd-timesyncd > /dev/null 2>&1; then msg_ok "$(translate "Conflicting utilities removed")" + else + msg_warn "$(translate "Some conflicting utilities may not have been removed")" fi - msg_info "$(translate "Performing system upgrade...")" - if [ "$pve_major" -ge 9 ] 2>/dev/null; then - apt-get install pv -y > /dev/null 2>&1 - fi + apt-get install pv -y > /dev/null 2>&1 if DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::='--force-confdef' \ @@ -153,48 +245,37 @@ update_proxmox() { return 1 fi - msg_info "$(translate "Installing essential Proxmox packages...")" - local essential_packages=("zfsutils-linux" "proxmox-backup-restore-image" "chrony") - local missing_packages=() - - for package in "${essential_packages[@]}"; do - if ! dpkg -l 2>/dev/null | grep -q "^ii $package "; then - missing_packages+=("$package") - fi - done - - if [ ${#missing_packages[@]} -gt 0 ]; then - DEBIAN_FRONTEND=noninteractive apt-get -y install "${missing_packages[@]}" >> "$log_file" 2>&1 + local additional_packages="zfsutils-linux proxmox-backup-restore-image chrony" + + if /usr/bin/env DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::='--force-confdef' install $additional_packages >> "$log_file" 2>&1; then msg_ok "$(translate "Essential Proxmox packages installed")" + else + msg_warn "$(translate "Some essential Proxmox packages may not have been installed")" fi - lvm_repair_check + cleanup_duplicate_repos - - perform_final_cleanup - + msg_info "$(translate "Performing system cleanup...")" + apt-get -y autoremove > /dev/null 2>&1 || true + apt-get -y autoclean > /dev/null 2>&1 || true + msg_ok "$(translate "Cleanup finished")" local end_time=$(date +%s) local duration=$((end_time - start_time)) local minutes=$((duration / 60)) local seconds=$((duration % 60)) - echo "" - echo -e "${TAB}${BGN}$(translate "=== PVE ${pve_major} UPDATE COMPLETED ===")${CL}" + echo -e "${TAB}${BGN}$(translate "=== PVE 9 UPDATE COMPLETED ===")${CL}" echo -e "${TAB}${GN}$(translate "Duration")${CL}: ${DGN}${minutes}m ${seconds}s${CL}" echo -e "${TAB}${GN}$(translate "Log file")${CL}: ${DGN}$log_file${CL}" echo -e "${TAB}${GN}$(translate "Packages upgraded")${CL}: ${DGN}$upgradable${CL}" - echo -e "${TAB}${GN}$(translate "Proxmox VE")${CL}: ${DGN}${pve_major}.x (Debian $target_codename)${CL}" - echo "" - - msg_ok "$(translate "Proxmox VE ${pve_major}.x system update completed successfully")" - + echo -e "${TAB}${GN}$(translate "Proxmox VE")${CL}: ${DGN}9.x (Debian $TARGET_CODENAME)${CL}" + msg_ok "$(translate "Proxmox VE 9.x configuration completed.")" } - if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - update_proxmox + update_pve9 fi