admin/xingrin
1
0
Fork 0
mirror of https://github.com/yyhuni/xingrin.git synced 2026-01-31 11:46:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix：交换分区开启命令

Browse Source
This commit is contained in:
yyhuni
2025-12-19 12:33:48 +08:00
parent 39cea5a918
commit ef117d2245
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docker/scripts/setup-swap.sh
View File

@@ -25,9 +25,9 @@ if [ "$EUID" -ne 0 ]; then
fi
# 检查是否已有交换分区
CURRENT_SWAP=$(swapon --show --bytes 2>/dev/null | tail -n +2 | awk '{sum += $3} END {print sum+0}')
if [ "$CURRENT_SWAP" -gt 0 ]; then
CURRENT_SWAP_GB=$(echo "scale=1; $CURRENT_SWAP / 1024 / 1024 / 1024" | bc)
CURRENT_SWAP_KB=$(grep SwapTotal /proc/meminfo | awk '{print $2}')
CURRENT_SWAP_GB=$((CURRENT_SWAP_KB / 1024 / 1024))
if [ "$CURRENT_SWAP_GB" -gt 0 ]; then
log_warn "系统已有 ${CURRENT_SWAP_GB}GB 交换分区"
swapon --show
read -p "是否继续添加新的交换分区？(y/N) " -r
@@ -39,7 +39,7 @@ fi
# 获取系统内存大小（GB）
TOTAL_MEM_KB=$(grep MemTotal /proc/meminfo | awk '{print $2}')
TOTAL_MEM_GB=$(echo "scale=0; $TOTAL_MEM_KB / 1024 / 1024" | bc)
TOTAL_MEM_GB=$((TOTAL_MEM_KB / 1024 / 1024))
# 确定交换分区大小
if [ -n "$1" ]; then

12
install.sh
View File

@@ -282,11 +282,13 @@ fi
# 交换分区配置（仅 Linux）
# ==============================================================================
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
# 获取当前内存和交换分区大小
# 获取当前内存大小（GB，纯 bash 算术）
TOTAL_MEM_KB=$(grep MemTotal /proc/meminfo | awk '{print $2}')
TOTAL_MEM_GB=$(echo "scale=0; $TOTAL_MEM_KB / 1024 / 1024" | bc)
CURRENT_SWAP=$(swapon --show --bytes 2>/dev/null | tail -n +2 | awk '{sum += $3} END {print sum+0}')
CURRENT_SWAP_GB=$(echo "scale=1; $CURRENT_SWAP / 1024 / 1024 / 1024" | bc)
TOTAL_MEM_GB=$((TOTAL_MEM_KB / 1024 / 1024))
# 获取当前交换分区大小（GB）
CURRENT_SWAP_KB=$(grep SwapTotal /proc/meminfo | awk '{print $2}')
CURRENT_SWAP_GB=$((CURRENT_SWAP_KB / 1024 / 1024))
# 推荐交换分区大小（与内存相同，最小1G，最大8G）
RECOMMENDED_SWAP=$TOTAL_MEM_GB
@@ -297,7 +299,7 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
info "系统内存: ${TOTAL_MEM_GB}GB，当前交换分区: ${CURRENT_SWAP_GB}GB"
# 如果交换分区小于推荐值，提示用户
if [ "$(echo "$CURRENT_SWAP_GB < $RECOMMENDED_SWAP" | bc)" -eq 1 ]; then
if [ "$CURRENT_SWAP_GB" -lt "$RECOMMENDED_SWAP" ]; then
echo -n -e "${BOLD}${CYAN}[?] 是否开启 ${RECOMMENDED_SWAP}GB 交换分区？可提升扫描稳定性 (Y/n) ${RESET}"
read -r setup_swap
echo