mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-09-15 06:32:37 +00:00
54257d5a8a
- Fixed command injection in desktop_display.sh by converting word-splitting loops to safe array-based iteration for LightDM/GDM3 configuration and XFCE package installation. - Added symlink detection guard before repository file operations in repos.sh to prevent TOCTOU attacks during restore_previous_repos(). - Hardened SUDO_USER resolution with awk validation against /etc/passwd to prevent root fallback and ensure real login users are targeted for sudoers configuration. - Implemented algorithm (lz4/zstd) and size validation before ZRAM configuration writes in zram.sh to reject invalid inputs. - Protected grep MemTotal read from /proc/meminfo with 2>/dev/null and default assignment under set -u. - Added || true guards around apt-cache madison pipelines in firmware.sh, kernel.sh, gpu.sh, and utils.sh to prevent pipefail aborts when backports unavailable. - Wrapped whiptail installation in if/else blocks to allow offline error messages instead of script termination under set -e. - Fixed grep -c output duplication in swap.sh with proper || true pattern and default variable assignment. - Replaced unquoted $cleaned loops with array conversion using while read for secure package iteration across gaming, desktop_display, firmware, and kernel modules. - Anchored sed regex patterns to space-delimited "main" components to prevent mirror URL corruption in sources.list editing. - Escaped % characters in _msg() function before passing to whiptail to prevent printf format interpretation crashes. - Consolidated package version helpers into canonical wrappers: _get_pkg_version, _get_installed_version, _get_backports_version for consistent apt/dpkg queries. - Created _install_if_missing() and _install_pkg() with proper error handling that respects set -e while providing user feedback on installation failures. - Removed 6 dead code functions (~51 lines): check_system_time, sync_system_time, get_cpu_summary, get_ram_summary, pkg_versions, get_backports_kernel_version. - Added detect_displayserver and detect_audio_server to refresh_system_state() for complete state refresh when returning from menus. - Enhanced _on_interrupt() trap handler to kill lingering apt/dpkg child processes and clean /tmp/debianito.* temporary files on Ctrl+C or TERM. - Improved restore_previous_repos() with manifest-based backup verification (.backed_up_* markers) to prevent destructive repository file deletion. - Added mktemp usage for secure temporary deb file downloads in nvidia.sh, heroic.sh, and tools.sh to eliminate TOCTOU vulnerabilities in /tmp. - Fixed Bluetooth USB dongle misclassification as WiFi devices by excluding "bluetooth" strings from USB_WIFI_DEVS detection in firmware.sh. - Properly utilized the need array for selective package installation in internet.sh instead of hardcoding full package list. - Corrected fwupdmgr duplicate execution and grep false positives in system.sh with strict pattern matching for available updates. - update docs and added quickstart guide
187 lines
5.7 KiB
Bash
187 lines
5.7 KiB
Bash
#!/usr/bin/env bash
|
|
# zram.sh — ZRAM submenu: view, create/reconfigure, remove
|
|
|
|
zram_menu() {
|
|
while true; do
|
|
local choice
|
|
choice=$(_menu "ZRAM Configuration" \
|
|
"Select an operation:" $TUI_ALTO $TUI_ANCHO 4 \
|
|
"1" "View ZRAM status" \
|
|
"2" "Create / Reconfigure ZRAM" \
|
|
"3" "Remove ZRAM" \
|
|
"4" "Back to main menu")
|
|
|
|
[ -z "$choice" ] && break
|
|
clear
|
|
|
|
case "$choice" in
|
|
1) _zram_view ;;
|
|
2) _zram_create ;;
|
|
3) _zram_remove ;;
|
|
4) break ;;
|
|
esac
|
|
done
|
|
}
|
|
|
|
_zram_view() {
|
|
if ! is_installed "zram-tools"; then
|
|
_msg "ZRAM Status" "ZRAM is not installed.\n\nUse option 2 (Create / Reconfigure ZRAM)\nto set it up." 10 55
|
|
return
|
|
fi
|
|
|
|
local algo="" size="" priority=""
|
|
if [ -f /etc/default/zramswap ]; then
|
|
while IFS='=' read -r key val; do
|
|
case "$key" in
|
|
ALGO) algo=$val ;;
|
|
SIZE) size=$val ;;
|
|
PRIORITY) priority=$val ;;
|
|
esac
|
|
done </etc/default/zramswap
|
|
fi
|
|
|
|
local info="ZRAM Configuration:\n"
|
|
info+=" Algorithm: ${algo:-not set}\n"
|
|
info+=" Size: ${size:-not set} MB\n"
|
|
info+=" Priority: ${priority:-not set}\n\n"
|
|
info+="Active ZRAM devices:\n"
|
|
|
|
local zram_out
|
|
zram_out=$(sudo zramctl 2>/dev/null || true)
|
|
if [ -n "$zram_out" ]; then
|
|
info+="$zram_out"
|
|
else
|
|
info+=" (none — service may be stopped)"
|
|
fi
|
|
|
|
_msg "ZRAM Status" "$info" 16 70
|
|
}
|
|
|
|
_zram_create() {
|
|
if [ -z "$RAM_KB" ] || [ "$RAM_KB" -eq 0 ]; then
|
|
echo -e "${RED}Could not determine RAM size. Aborting.${NC}"
|
|
return 1
|
|
fi
|
|
|
|
if is_installed "zram-tools"; then
|
|
local cur_algo="" cur_size="" cur_prio=""
|
|
if [ -f /etc/default/zramswap ]; then
|
|
while IFS='=' read -r key val; do
|
|
case "$key" in
|
|
ALGO) cur_algo=$val ;;
|
|
SIZE) cur_size=$val ;;
|
|
PRIORITY) cur_prio=$val ;;
|
|
esac
|
|
done </etc/default/zramswap
|
|
fi
|
|
local cur="ZRAM is already configured:\n"
|
|
cur+=" Algorithm: ${cur_algo:-not set}\n"
|
|
cur+=" Size: ${cur_size:-not set} MB\n"
|
|
cur+=" Priority: ${cur_prio:-not set}\n\n"
|
|
cur+="Continuing will overwrite this configuration."
|
|
if ! _confirm "ZRAM — Reconfigure" "$cur"; then
|
|
echo "ZRAM reconfiguration cancelled."
|
|
return
|
|
fi
|
|
fi
|
|
|
|
local ram_gb=$((RAM_KB / 1024 / 1024))
|
|
if [ "$ram_gb" -gt 8 ]; then
|
|
recommended_mb=4096
|
|
else
|
|
recommended_mb=$((((RAM_KB / 1024 / 1024 + 1) / 2) * 1024))
|
|
fi
|
|
|
|
local algo
|
|
algo=$(_menu "ZRAM Configuration" \
|
|
"ZRAM creates a compressed swap device in RAM to reduce disk I/O and boost speed. Data is stored compressed in memory. Choose an algorithm below to balance CPU usage and compression ratio:" \
|
|
$TUI_ALTO $TUI_ANCHO $TUI_ALTO_LISTA \
|
|
"lz4" "Fastest compression. Lowest CPU overhead. (Default)" \
|
|
"zstd" "Higher compression ratio. Saves more RAM, uses more CPU.")
|
|
|
|
if [ -z "$algo" ]; then
|
|
echo "ZRAM configuration cancelled."
|
|
return
|
|
fi
|
|
|
|
local zram_size
|
|
if _confirm "ZRAM Size" "Use recommended size for ZRAM? (${recommended_mb} MB out of ${RAM_SUMMARY})"; then
|
|
zram_size=$recommended_mb
|
|
else
|
|
zram_size=$(_inputbox "ZRAM Size" "Enter ZRAM size in MB:" 8 60 "$recommended_mb")
|
|
if [ -z "$zram_size" ] || ! [[ "$zram_size" =~ ^[0-9]+$ ]] || [ "$zram_size" -eq 0 ]; then
|
|
echo "ZRAM configuration cancelled."
|
|
return
|
|
fi
|
|
fi
|
|
|
|
if ! _confirm "ZRAM Summary" "Algorithm: ${algo}\nSize: ${zram_size} MB\nPriority: 100\n\nApply?"; then
|
|
echo "ZRAM configuration cancelled."
|
|
return
|
|
fi
|
|
|
|
_run_cmd "ZRAM" "sudo apt install -y zram-tools" "Installing zram-tools..."
|
|
|
|
echo "Resetting existing ZRAM device..."
|
|
sudo swapoff /dev/zram0 2>/dev/null || true
|
|
sudo modprobe -r zram 2>/dev/null || true
|
|
|
|
echo "Writing configuration..."
|
|
# SECURITY: Validate algo and size before writing to system file.
|
|
[[ "$algo" =~ ^(lz4|zstd)$ ]] || {
|
|
echo "Invalid ZRAM algorithm" >&2
|
|
return 1
|
|
}
|
|
[[ "$zram_size" =~ ^[0-9]+$ ]] || {
|
|
echo "Invalid ZRAM size" >&2
|
|
return 1
|
|
}
|
|
sudo tee /etc/default/zramswap >/dev/null <<EOF
|
|
ALGO=$algo
|
|
SIZE=$zram_size
|
|
PRIORITY=100
|
|
EOF
|
|
|
|
echo "Restarting zramswap service..."
|
|
sudo systemctl restart zramswap
|
|
|
|
if ! grep -q "\[${algo}\]" /sys/block/zram0/comp_algorithm 2>/dev/null; then
|
|
echo -e "${YELLOW}Warning: ZRAM algorithm not applied yet. Reboot to finalize.${NC}"
|
|
fi
|
|
|
|
echo ""
|
|
echo -e "${GREEN}ZRAM configured successfully.${NC}"
|
|
echo ""
|
|
sudo zramctl
|
|
echo ""
|
|
echo -e "${GREEN}You can verify with: sudo zramctl${NC}"
|
|
_pause
|
|
}
|
|
|
|
_zram_remove() {
|
|
if ! is_installed "zram-tools"; then
|
|
_msg "ZRAM Remove" "ZRAM is not installed.\n\nNothing to remove." 10 50
|
|
return
|
|
fi
|
|
|
|
if ! _confirm "Remove ZRAM" \
|
|
"This will:\n - Stop the zramswap service\n - Purge zram-tools\n - Remove /etc/default/zramswap\n\nProceed?"; then
|
|
echo "ZRAM removal cancelled."
|
|
return
|
|
fi
|
|
|
|
echo "Stopping zramswap service..."
|
|
sudo systemctl stop zramswap || true
|
|
|
|
echo "Releasing ZRAM device..."
|
|
sudo swapoff /dev/zram0 2>/dev/null || true
|
|
sudo modprobe -r zram 2>/dev/null || true
|
|
|
|
_run_cmd "ZRAM" "sudo apt purge -y zram-tools" "Purging zram-tools..."
|
|
|
|
echo "Removing configuration..."
|
|
sudo rm -f /etc/default/zramswap
|
|
|
|
_msg "ZRAM Removed" "ZRAM has been removed successfully.\n\nThe zramswap service is stopped and disabled." 10 55
|
|
}
|