nexus/ProxmoxVE
2
0
Fork 0
mirror of https://github.com/community-scripts/ProxmoxVE.git synced 2026-05-13 12:15:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert(api): revert PR #11913 RAM speed changes, fix REPO_SOURCE fallback

Browse Source
This commit is contained in:
CanbiZ (MickLesk)
2026-02-15 10:11:14 +01:00
parent 6c5f2aa9c1
commit 39afa87703
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
misc/api.func
+9 -14
View File
@@ -335,7 +335,7 @@ detect_gpu() {
GPU_PASSTHROUGH="unknown" GPU_PASSTHROUGH="unknown"
local gpu_line local gpu_line
gpu_line=$(lspci 2>/dev/null | grep -iE "VGA|3D|Display" | head -1 || true) gpu_line=$(lspci 2>/dev/null | grep -iE "VGA|3D|Display" | head -1)
if [[ -n "$gpu_line" ]]; then if [[ -n "$gpu_line" ]]; then
# Extract model: everything after the colon, clean up # Extract model: everything after the colon, clean up
@@ -374,7 +374,7 @@ detect_cpu() {
if [[ -f /proc/cpuinfo ]]; then if [[ -f /proc/cpuinfo ]]; then
local vendor_id local vendor_id
vendor_id=$(grep -m1 "vendor_id" /proc/cpuinfo 2>/dev/null | cut -d: -f2 | tr -d ' ' || true) vendor_id=$(grep -m1 "vendor_id" /proc/cpuinfo 2>/dev/null | cut -d: -f2 | tr -d ' ')
case "$vendor_id" in case "$vendor_id" in
GenuineIntel) CPU_VENDOR="intel" ;; GenuineIntel) CPU_VENDOR="intel" ;;
@@ -388,7 +388,7 @@ detect_cpu() {
esac esac
# Extract model name and clean it up # Extract model name and clean it up
CPU_MODEL=$(grep -m1 "model name" /proc/cpuinfo 2>/dev/null | cut -d: -f2 | sed 's/^ *//' | sed 's/(R)//g' | sed 's/(TM)//g' | sed 's/ */ /g' | cut -c1-64 || true) CPU_MODEL=$(grep -m1 "model name" /proc/cpuinfo 2>/dev/null | cut -d: -f2 | sed 's/^ *//' | sed 's/(R)//g' | sed 's/(TM)//g' | sed 's/ */ /g' | cut -c1-64)
fi fi
export CPU_VENDOR CPU_MODEL export CPU_VENDOR CPU_MODEL
@@ -407,19 +407,14 @@ detect_ram() {
if command -v dmidecode &>/dev/null; then if command -v dmidecode &>/dev/null; then
# Get configured memory speed (actual running speed) # Get configured memory speed (actual running speed)
RAM_SPEED=$(dmidecode -t memory 2>/dev/null | grep -m1 "Configured Memory Speed:" | grep -oE "[0-9]+" | head -1 || true) RAM_SPEED=$(dmidecode -t memory 2>/dev/null | grep -m1 "Configured Memory Speed:" | grep -oE "[0-9]+" | head -1)
# Fallback to Speed: if Configured not available # Fallback to Speed: if Configured not available
if [[ -z "$RAM_SPEED" ]]; then if [[ -z "$RAM_SPEED" ]]; then
RAM_SPEED=$(dmidecode -t memory 2>/dev/null | grep -m1 "Speed:" | grep -oE "[0-9]+" | head -1 || true) RAM_SPEED=$(dmidecode -t memory 2>/dev/null | grep -m1 "Speed:" | grep -oE "[0-9]+" | head -1)
fi fi
fi fi
# Ensure RAM_SPEED is a valid integer (PocketBase stores it as integer)
if [[ -z "$RAM_SPEED" || ! "$RAM_SPEED" =~ ^[0-9]+$ ]]; then
RAM_SPEED=0
fi
export RAM_SPEED export RAM_SPEED
} }
@@ -514,7 +509,7 @@ post_to_api() {
"gpu_vendor": "${gpu_vendor}", "gpu_vendor": "${gpu_vendor}",
"gpu_model": "${gpu_model}", "gpu_model": "${gpu_model}",
"gpu_passthrough": "${gpu_passthrough}", "gpu_passthrough": "${gpu_passthrough}",
"ram_speed": ${ram_speed:-0}, "ram_speed": "${ram_speed}",
"repo_source": "${REPO_SOURCE}" "repo_source": "${REPO_SOURCE}"
} }
EOF EOF
@@ -618,7 +613,7 @@ post_to_api_vm() {
"gpu_vendor": "${gpu_vendor}", "gpu_vendor": "${gpu_vendor}",
"gpu_model": "${gpu_model}", "gpu_model": "${gpu_model}",
"gpu_passthrough": "${gpu_passthrough}", "gpu_passthrough": "${gpu_passthrough}",
"ram_speed": ${ram_speed:-0}, "ram_speed": "${ram_speed}",
"repo_source": "${REPO_SOURCE}" "repo_source": "${REPO_SOURCE}"
} }
EOF EOF
@@ -752,7 +747,7 @@ post_update_to_api() {
"gpu_vendor": "${gpu_vendor}", "gpu_vendor": "${gpu_vendor}",
"gpu_model": "${gpu_model}", "gpu_model": "${gpu_model}",
"gpu_passthrough": "${gpu_passthrough}", "gpu_passthrough": "${gpu_passthrough}",
"ram_speed": ${ram_speed:-0}, "ram_speed": "${ram_speed}",
"repo_source": "${REPO_SOURCE}" "repo_source": "${REPO_SOURCE}"
} }
EOF EOF
@@ -794,7 +789,7 @@ EOF
"gpu_vendor": "${gpu_vendor}", "gpu_vendor": "${gpu_vendor}",
"gpu_model": "${gpu_model}", "gpu_model": "${gpu_model}",
"gpu_passthrough": "${gpu_passthrough}", "gpu_passthrough": "${gpu_passthrough}",
"ram_speed": ${ram_speed:-0}, "ram_speed": "${ram_speed}",
"repo_source": "${REPO_SOURCE}" "repo_source": "${REPO_SOURCE}"
} }
EOF EOF