mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-10-31 13:08:06 +00:00
Desktop environment support & QA expansion
- `.github/workflows/ci.yml` added as a new workflow: job `lint-and-test` on `runs-on: ubuntu-latest` with `container: debian:trixie`, checking out via `actions/checkout@v4`, installing `bats` and `shellcheck`, running `shellcheck --severity=error debianito.sh modules/**/*.sh` (with `shopt -s globstar`) and `bats tests/`.
- `debianito.sh` CLI parser: `AUTO_YES=0`, `ALLOW_DESTRUCTIVE=0` declared after `MODULES_DIR` and before `_boot_mark`; `_usage()` prints `Usage: debianito.sh [OPTIONS]` with `--yes`, `--allow-destructive` and `--help`; the `while [ $# -gt 0 ]` / `case` loop consumes `--yes` and `--allow-destructive`, prints `Unknown option: $1 (run with --help for usage)` to stderr and `exit 2` for unknown flags, and `--help|-h` runs `_usage` then `exit 0`.
- `modules/utils.sh`: new global `_SELECTION_CONFIRMED=0` and `_confirm_install_list()` (utils.sh:756-785), which renders items capped at 15 with `... and N more`, computes `height` capped at 24, calls `_confirm "$title" "$list" "$height" 65`, arms `_SELECTION_CONFIRMED=${#items[@]}` on yes, and returns 1 for an empty list or on decline. `_install_pkg()` (utils.sh:789-804) decrements the countdown instead of prompting, and only prompts via `elif ! _confirm "Install: ${pkg}" "Install ${pkg}\nVersion: ${ver}?"; then return 0`.
- Bulk retrofit in `modules/extras/**/*.sh` (18 sites): `_confirm_install_list "Título" "${array[@]}" || return` placed right after the `whiptail` selection is parsed, the install loop left intact, and `_SELECTION_CONFIRMED=0` after the loop. Files: office/office.sh:101, system/software_centers.sh:29, system/system.sh:133, communication/communication.sh:68, design/design.sh:42, download/download.sh:48+55, terminals/terminals.sh:31, security/security.sh:30, players/players.sh:20, themes/fonts/fonts.sh:32, dev/dev.sh:44, programming/programming.sh:57, themes/desktop-themes/desktop-themes.sh:30, fetch/fetch.sh:41, themes/icons/icons.sh:47, themes/cursors/cursors.sh:28, internet/internet.sh:197, java.
- `modules/bullseye/extras.sh` (13 sites) plus `modules/bullseye/legacy.sh` (1 site, `install_gaming_bullseye`, guarded with `if [ ${#_install_pkgs[@]} -gt 0 ]` so a i386-only selection does not blank the summary) plus `modules/desktop_display.sh` (1 site, XFCE Custom — a no-loop `_run_cmd` batch with the reset immediately after it). Special cases: download.sh and bullseye/download each have two checklists merged into one combined summary; legacy.sh gaming skips the reset when the list is empty; XFCE Custom resets before `_xfce_polkit_rules` so the counter cannot leak.
- `modules/desktops/desktop_gnome.sh` (new): `gnome_menu()` runs a `_radiolist` with "1" "GNOME (Full Desktop)", "2" "GNOME Core (Minimal Install)", "3" "Back", then `_install_gnome_full()` and `_install_gnome_core()`. Each arms `_confirm_install_list "GNOME Full Desktop" gnome gdm3 || return` (core: `gnome-core gdm3`), keeps an already-configured display manager via `_existing_display_manager` by setting `target_dm="$keep_dm"`, writes the preseed `echo "${target_dm} shared/default-x-display-manager select ${target_dm}" | sudo debconf-set-selections`, installs `sudo apt install -y gnome gdm3` / `gnome-core gdm3`, enables `gdm3` only when `target_dm = "gdm3"`, resets `_SELECTION_CONFIRMED=0` and calls `_offer_pipewire_after_desktop`.
- `modules/desktops/desktop_kde.sh` (new): `kde_menu()` runs a `_radiolist` with "1" "KDE Plasma (Full Desktop)", "2" "KDE Plasma Desktop (Minimal)", "3" "Back"; `_install_kde_full()` and `_install_kde_minimal()` arm `_confirm_install_list "KDE Plasma Full" kde-standard sddm || return` (minimal: `kde-plasma-desktop sddm`), preseed `sddm shared/default-x-display-manager select sddm`, install `sudo apt install -y kde-standard sddm` / `kde-plasma-desktop sddm`, enable `sddm` only when it is the target DM, reset the counter and offer PipeWire.
- `modules/desktop_display.sh` `desktop_environment_menu()`: `env_items+=("3" "GNOME")`, `env_items+=("4" "KDE Plasma")`, `env_items+=("5" "Back")`; the case adds `3)` loading `gnome` via `_load_module gnome || continue` and calling `gnome_menu`, and `4)` loading `kde` via `_load_module kde || continue` and calling `kde_menu`; the dead TODO comment was removed.
- PipeWire retrofit in `modules/desktop_display.sh` (6 sites): `_install_lxde_full`, `_install_lxde_core`, `_install_xfce_full`, `_install_xfce_minimal`, `_install_xfce_wayland` and `_install_xfce_custom` each call `_offer_pipewire_after_desktop` after their install block.
- `_offer_pipewire_after_desktop()` and `_existing_display_manager()` added at the end of `modules/desktop_display.sh`: `_offer_pipewire_after_desktop` checks `pipewire-audio` (`pipewire` when `DEBIAN_VERSION = 11`), returns 0 via `is_installed`, otherwise `_confirm "PipeWire Audio" "No PipeWire audio server is installed.\n\nInstall the PipeWire audio stack (recommended)?"` calls `_install_pipewire_standard` and returns 0. `_existing_display_manager` reads `${DM_FILE:-/etc/X11/default-display-manager}`, reads the basename as the DM, and otherwise scans `gdm3 lightdm sddm greetd gdm` with `systemctl is-enabled`, printing nothing when none is found.
- `_ensure_apt_updated` added before the GNOME/KDE `apt install` transactions (4 sites, deduplicated per session); `gnome gdm3` and `kde-standard sddm` are installed alongside even when another display manager is kept as the default.
- Extraction to `modules/desktops/`: `desktop_lxde.sh` (38 lines) and `desktop_xfce.sh` (119 lines) created with the `lxde_menu` / `_install_lxde_full` / `_install_lxde_core` and `xfce_menu` / `_install_xfce_full` / `_install_xfce_minimal` / `_install_xfce_wayland` / `_install_xfce_custom` / `_xfce_polkit_rules` blocks moved verbatim; both carry `# License GPL v3` in their headers.
- `modules/desktop_display.sh` reduced from 542 to 394 lines (−154): lines 55-208 removed, the dispatch (desktop_display.sh:39-46) replaced with `_load_module xfce || continue` / `lxde_menu`, and the file left with `manage_desktop_display`, `desktop_environment_menu`, `display_manager_menu`, `lightdm_config_menu`, `configure_greetd`, `configure_gdm3`, `configure_sddm`, the two shared helpers.
- `modules/utils.sh` `_load_module` map: `xfce)` → `${MODULES_DIR}/desktops/desktop_xfce.sh`, `lxde)` → `${MODULES_DIR}/desktops/desktop_lxde.sh`, `gnome)` → `${MODULES_DIR}/desktops/desktop_gnome.sh`, `kde)` → `${MODULES_DIR}/desktops/desktop_kde.sh`; deps for `xfce`, `lxde`, `gnome` and `kde` are `(desktop_display audio)` and `desktop_display` is `(repos audio)`.
- `modules/desktops/desktop_xfce.sh` `_xfce_polkit_rules()` writes `/etc/polkit-1/rules.d/85-suspend.rules` and `89-backlight.rules` via `sudo tee`, adds the `backlight` group with `groupadd --system` fallback, adds the real login user from `/etc/passwd` to `backlight` and restarts `polkit.service`.
- ES→EN user-facing strings: 14 strings across 4 files — `desktop_display.sh` `lxdе_menu` ("LXDE (Full Desktop)", "LXDE Core (Minimal Install)"), `gpu/nvidia.sh` Kepler legacy-driver notice ("Kepler GPU detected (GKxxx)… Install the legacy driver for Kepler?"), `bullseye/legacy.sh` ("Install NVIDIA driver?", "Skipping NVIDIA driver.", "Installing NVIDIA driver ${gpu_gen}...") and `bullseye/extras.sh` ("firmware-linux-nonfree provides drivers for… Install?").
- ES→EN internal comments: ~35 comments across 9 files — section headers in `_install_nvidia_standard`, `gpu/_helpers.sh` (lines 5, 113), `gpu/nvidia.sh` (lines 8-12, 19-22, 68-70, 167-172, 196, 239-253, 262-263, 275, 291, 336-338, 376), `gpu.sh` (lines 15-17), `bullseye/repos.sh` (line 2), `firmware.sh` (line 235, "--- Load verification ---"), `utils.sh` (lines 129, 132, 153 — timezone Paso 1/2/4) and `utils.sh:546,548`.
- set -e abort fix: `debianito.sh:149` now reads `_system_preferences_menu || true`, consistent with the other dispatch chains (14 of the 15 chains already had the guard); a declined pre-apply summary now leaves the TUI alive instead of terminating the script.
- `docs/desktops_display.md`: 4 hunks — intro now lists GNOME/GNOME Core/KDE Plasma/KDE Plasma Desktop/XFCE/XFCE Wayland/XFCE Custom/LXDE, a new "Modular layout" paragraph describing `modules/desktops/` and lazy loading, Block 1 rewritten into four environments, five new bullets (pre-apply summary, existing-DM preservation, PipeWire offer, stale-lists guard) and a Desktop Environment Packages table.
- `docs/quickstart.md` line 284: Desktop Environment entry expanded to pick from XFCE (full / minimal / Wayland `labwc` on Trixie / custom checklist), LXDE (full / core), GNOME (full / core) or KDE Plasma (full / minimal).
- `_existing_display_manager` now takes the config path via `local dm_file="${DM_FILE:-/etc/X11/default-display-manager}"` so the offline test suite never reads the real system file.
- `tests/test_helper.bash`: added `_mock_systemctl()` for `is-enabled` (units in `MOCK_SYSTEMCTL_ENABLED` report `enabled`, everything else `disabled`), `MOCK_SYSTEMCTL_ENABLED=""`, `WHIPTAIL_CALLS`/`MOCK_WHIPTAIL_OUTPUT`/`MOCK_WHIPTAIL_RC`, `MOCK_DPKG_INSTALLED` and the `systemctl` entry in the mock list and in `mock_reset()`.
- `tests/desktops.bats` created with 16 tests: `_existing_display_manager` (file read, file-preferred over an enabled unit, enabled-unit fallback, candidate order, missing file, nothing configured), `_offer_pipewire_after_desktop` (5 tests: skip-installed, accept-installs, decline-returns-0, Bullseye package name, wrong package name on 11), `_load_module` (4 tests for xfce/lxde/gnome/kde) and an unknown-module case; 17→33 tests total.
- `.github/workflows/ci.yml` shellcheck severity raised from `--severity=error` to `--severity=warning`.
- `debianito.sh`: `RED`, `GREEN`, `YELLOW`, `CYAN` and `NC` plus `AUTO_YES`, `ALLOW_DESTRUCTIVE` and `DEBIAN_CODENAME` are now `export`ed as cross-file globals.
- `modules/utils.sh`: `HAS_NVIDIA`, `DESKTOP_ENV`, `AUDIO_SERVER`, `DEBIAN_VERSION` and the other cross-file globals are `export`ed.
- `modules/extras/system/software_centers.sh` gained a `#!/usr/bin/env bash` shebang.
- `shellcheck` triage (v0.11.0, baseline `--severity=warning` 25 findings → 0): removed two dead-code lines (`headless` in `extras/dev/dev.sh`, orphan `dev_id` in `firmware.sh`); `SC2206` in `extras/dev/essential.sh` fixed by expanding `$comp_pkgs` to `"${comp_pkgs[@]}"`; `SC2010`/`SC2046` (3 sites) replaced `ls … | grep` with `compgen -G "…"`; `SC2155` (2 sites, `gpu.sh` and `rescue.sh`) split command substitutions into separate lines; `SC2166` in `repos.sh` replaced `-o` with `{ … || … }`; `SC2221`/`SC2222` (2 sites, `sysinfo.sh` and `utils.sh`) collapsed the `wl*|wlp*|wlo*|wlan*` alternation to `wl*`; `SC1090` in `extras.sh` gained a justification comment on the disable directive.
- Final verification: `bash -n` on all 15 modified `.sh` files and `set -euo pipefail` at `debianito.sh:3` both intact; `bats tests/` reports 33 ok / 0 failed; invariants `offers 11`, `confirm_install_list 39` and `_SELECTION_CONFIRMED=0 40` hold.
This commit is contained in:
stornic56
@@ -2,12 +2,12 @@
|
||||
# Shared helpers for GPU submodules
|
||||
|
||||
declare -A NVIDIA_FAMILY_MAP=(
|
||||
# Fermi / Kepler (Legacy: el shim se encarga de separarlos)
|
||||
# Fermi / Kepler (Legacy: the shim separates them)
|
||||
["06"]="legacy" ["0D"]="legacy" ["0E"]="legacy"
|
||||
["0F"]="legacy" ["10"]="legacy" ["11"]="legacy" ["12"]="legacy"
|
||||
# Maxwell
|
||||
["13"]="maxwell" ["14"]="maxwell" ["16"]="maxwell" ["17"]="maxwell"
|
||||
# Pascal + Volta (Misma política de driver clásico)
|
||||
# Pascal + Volta (same classic driver policy)
|
||||
["15"]="pascal" ["1B"]="pascal" ["1C"]="pascal" ["1D"]="pascal"
|
||||
# Turing
|
||||
["1E"]="turing" ["1F"]="turing" ["21"]="turing"
|
||||
@@ -43,8 +43,8 @@ _is_nvidia_kepler_id() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Normaliza la familia de arquitectura NVIDIA desambiguando Kepler/Fermi
|
||||
# (detect_nvidia_arch los agrupa como "legacy" vía rango de device IDs)
|
||||
# Normalizes the NVIDIA architecture family, disambiguating Kepler/Fermi
|
||||
# (detect_nvidia_arch groups them as "legacy" via device-ID range)
|
||||
_get_nvidia_arch_family() {
|
||||
local fam
|
||||
fam=$(detect_nvidia_arch "$NVIDIA_GPU_DEVICE_ID")
|
||||
@@ -109,8 +109,8 @@ _install_mesa_backports() {
|
||||
fi
|
||||
done
|
||||
|
||||
# Mesa >= 25.3.3 unificó VA-API dentro de mesa-libgallium.
|
||||
# mesa-va-drivers desde backports rompe con la nueva mesa-libgallium.
|
||||
# Mesa >= 25.3.3 unified VA-API into mesa-libgallium.
|
||||
# mesa-va-drivers from backports breaks with the new mesa-libgallium.
|
||||
local _bpo_filtered=()
|
||||
for _p in "${bpo_pkgs[@]}"; do
|
||||
[ "$_p" != "mesa-va-drivers" ] && _bpo_filtered+=("$_p")
|
||||
@@ -189,8 +189,8 @@ _is_hybrid_laptop() {
|
||||
gpu_count=$(echo "$LSPCI_OUTPUT" | grep -ciE "VGA compatible|3D controller") || true
|
||||
[ "$gpu_count" -lt 2 ] && return 1
|
||||
|
||||
# Defensa en profundidad: si TODAS las GPUs son NVIDIA (SLI o
|
||||
# dual-GPU desktop), no hay iGPU Intel/AMD → no es híbrida.
|
||||
# Defense in depth: if ALL GPUs are NVIDIA (SLI or dual-GPU
|
||||
# desktop), there is no Intel/AMD iGPU → not hybrid.
|
||||
nvidia_count=$(echo "$LSPCI_OUTPUT" | grep -iE "VGA compatible|3D controller" | grep -c "10de:") || true
|
||||
[ "$nvidia_count" -ge "$gpu_count" ] && return 1
|
||||
|
||||
@@ -199,6 +199,6 @@ _is_hybrid_laptop() {
|
||||
8 | 9 | 10 | 11 | 14 | 30 | 31 | 32) return 0 ;;
|
||||
esac
|
||||
|
||||
ls /sys/class/power_supply/ 2>/dev/null | grep -q "^BAT" && return 0
|
||||
compgen -G "/sys/class/power_supply/BAT*" >/dev/null && return 0
|
||||
return 1
|
||||
}
|
||||
|
||||
+51
-50
@@ -4,22 +4,22 @@
|
||||
# CASE A : Trixie + backports kernel → Official NVIDIA CUDA Repo (Pinned v590)
|
||||
# CASE B : Kernel stable (any distro) → Debian stable
|
||||
#
|
||||
# Nota: Debian 12 (Bookworm) backports llegaron a EOL (2026-08-09);
|
||||
# el flujo NVIDIA solo usa el repositorio estable para Debian 12.
|
||||
# Note: Debian 12 (Bookworm) backports reached EOL (2026-08-09);
|
||||
# the NVIDIA flow only uses the stable repo for Debian 12.
|
||||
|
||||
# -------------------------------------------------------------------
|
||||
# Shared helper: enable NVIDIA CUDA repo
|
||||
# Debian 13 (Trixie): cuda-keyring (método oficial — extrepo roto)
|
||||
# Debian 12 (Bookworm): extrepo nvidia-cuda (funciona)
|
||||
# Debian 13 (Trixie): cuda-keyring (official method — broken extrepo)
|
||||
# Debian 12 (Bookworm): extrepo nvidia-cuda (works)
|
||||
# -------------------------------------------------------------------
|
||||
_enable_cuda_repo() {
|
||||
_is_cuda_repo_ready && return 0
|
||||
|
||||
if [ "$DEBIAN_VERSION" = "13" ]; then
|
||||
# Método oficial NVIDIA: cuda-keyring (extrepo no configura
|
||||
# correctamente el repo en Trixie)
|
||||
# Official NVIDIA method: cuda-keyring (extrepo does not
|
||||
# configure the repo correctly on Trixie)
|
||||
if dpkg -s cuda-keyring &>/dev/null; then
|
||||
return 0 # ya instalado → su .list ya existe
|
||||
return 0 # already installed → its .list already exists
|
||||
fi
|
||||
local tmp_deb
|
||||
tmp_deb=$(mktemp "${TMPDIR:-/tmp}/cuda-keyring.XXXXXX.deb") || return 1
|
||||
@@ -65,10 +65,10 @@ _nvidia_secure_boot_enabled() {
|
||||
mokutil --sb-state 2>/dev/null | grep -q "SecureBoot enabled"
|
||||
}
|
||||
|
||||
# Aviso no fatal: el módulo DKMS está compilado pero NO firmado.
|
||||
# El usuario avanzado puede firmarlo con MOK; el novato necesita saber
|
||||
# por qué verá pantalla negra tras reiniciar. Si mokutil falta, no se
|
||||
# muestra nada (mokutil no viene preinstalado en Debian).
|
||||
# Non-fatal notice: the DKMS module is compiled but NOT signed.
|
||||
# Advanced users can sign it with MOK; novices need to know why
|
||||
# they will see a black screen after reboot. If mokutil is missing,
|
||||
# nothing is shown (mokutil is not preinstalled on Debian).
|
||||
_warn_secure_boot() {
|
||||
if _nvidia_secure_boot_enabled; then
|
||||
echo -e "${RED}WARNING: Secure Boot is enabled. The NVIDIA DKMS module is compiled but NOT signed.${NC}"
|
||||
@@ -164,13 +164,13 @@ _show_nvidia_version_menu() {
|
||||
# -------------------------------------------------------------------
|
||||
# NVIDIA Wayland/KMS base configuration (/etc/modprobe.d/nvidia-wayland.conf)
|
||||
# Applies on Debian 12/13, any driver version (535/550/590/595).
|
||||
# Arquitectura y detección híbrida son ORTOGONALES:
|
||||
# - Arquitectura → afecta SOLO fbdev (kepler: el 470 no lo soporta)
|
||||
# y el color/mensaje informativo.
|
||||
# - Híbrida vs desktop → afecta NVreg (Preserve / kernel suspend
|
||||
# notifier), INDEPENDIENTE de la arquitectura.
|
||||
# 590/595 añaden el kernel suspend notifier (complementa, nunca
|
||||
# reemplaza, NVreg_PreserveVideoMemoryAllocations).
|
||||
# Architecture and hybrid detection are ORTHOGONAL:
|
||||
# - Architecture → affects ONLY fbdev (kepler: the 470 does not
|
||||
# support it) and the color/info message.
|
||||
# - Hybrid vs desktop → affects NVreg (Preserve / kernel suspend
|
||||
# notifier), INDEPENDENT of architecture.
|
||||
# 590/595 add the kernel suspend notifier (complements, never
|
||||
# replaces, NVreg_PreserveVideoMemoryAllocations).
|
||||
# -------------------------------------------------------------------
|
||||
_configure_nvidia_wayland() {
|
||||
local ver="${1:-$NVIDIA_SELECTED_VERSION}"
|
||||
@@ -181,7 +181,7 @@ _configure_nvidia_wayland() {
|
||||
local msg="Wayland config (desktop): KMS + video memory preservation enabled."
|
||||
arch=$(_get_nvidia_arch_family)
|
||||
|
||||
# ── Arquitectura: solo fbdev y mensaje de color ──
|
||||
# ── Architecture: fbdev only and color message ──
|
||||
case "$arch" in
|
||||
kepler)
|
||||
color="${RED}"
|
||||
@@ -193,7 +193,7 @@ _configure_nvidia_wayland() {
|
||||
;;
|
||||
esac
|
||||
|
||||
# ── Híbrida vs desktop: NVreg independiente de la arquitectura ──
|
||||
# ── Hybrid vs desktop: NVreg independent of architecture ──
|
||||
if _is_hybrid_laptop; then
|
||||
content="options nvidia-drm modeset=1"$'\n'
|
||||
[ "$arch" != "kepler" ] && content+="options nvidia-drm fbdev=1"$'\n'
|
||||
@@ -236,8 +236,9 @@ _install_nvidia_cuda_repo() {
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Step 2: apt update explícito — sin índice actualizado el repo no
|
||||
# se ve y apt resolvería el candidato Debian (v550) en vez de v${ver}.
|
||||
# Step 2: explicit apt update — without an updated index the repo
|
||||
# is invisible and apt would resolve the Debian candidate (v550)
|
||||
# instead of v${ver}.
|
||||
if ! _run_cmd "CUDA Repo" "sudo apt update" \
|
||||
"Updating package lists after enabling CUDA repository..."; then
|
||||
NVIDIA_DRIVER_MODE=""
|
||||
@@ -245,12 +246,12 @@ _install_nvidia_cuda_repo() {
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Step 3: Pinning oficial — transacción APT INDEPENDIENTE y
|
||||
# obligatoria. APT lee /etc/apt/preferences.d/ al inicio de su
|
||||
# ejecución, no durante la transacción: el pinning debe estar
|
||||
# instalado ANTES de instalar el driver. Si el repo no lo publica,
|
||||
# es un problema del repo de NVIDIA: abortar limpiamente en vez de
|
||||
# instalar una versión que el usuario no eligió.
|
||||
# Step 3: Official pinning — INDEPENDENT and mandatory APT
|
||||
# transaction. APT reads /etc/apt/preferences.d/ at startup, not
|
||||
# during the transaction: the pinning must be installed BEFORE
|
||||
# installing the driver. If the repo does not publish it, it is
|
||||
# an NVIDIA repo problem: abort cleanly instead of installing a
|
||||
# version the user did not choose.
|
||||
if ! _run_cmd "NVIDIA Pinning" \
|
||||
"sudo apt install -y nvidia-driver-pinning-${ver}" \
|
||||
"Installing NVIDIA version pinning (${ver})..."; then
|
||||
@@ -259,11 +260,11 @@ _install_nvidia_cuda_repo() {
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Step 4: Instalar el metapaquete (pinning ya activo). Si falla,
|
||||
# el pinning queda instalado (solo config, no es problema).
|
||||
# firmware-nvidia-gsp llega como dependencia transitiva obligatoria
|
||||
# Step 4: Install the metapackage (pinning already active). If it
|
||||
# fails, the pinning remains installed (config only, not a problem).
|
||||
# firmware-nvidia-gsp arrives as a mandatory transitive dependency
|
||||
# (nvidia-open → nvidia-kernel-open-dkms → firmware-nvidia-gsp),
|
||||
# alineado con la doc oficial: apt -V install nvidia-open.
|
||||
# aligned with the official docs: apt -V install nvidia-open.
|
||||
if ! _run_cmd "NVIDIA CUDA" \
|
||||
"sudo apt install -y nvidia-open" \
|
||||
"Installing NVIDIA driver from CUDA repository..."; then
|
||||
@@ -272,7 +273,7 @@ _install_nvidia_cuda_repo() {
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Post-install: el módulo DKMS instalado debe coincidir con la rama ${ver}
|
||||
# Post-install: the installed DKMS module must match the ${ver} branch
|
||||
local dkms_ver
|
||||
dkms_ver=$(dpkg -l nvidia-kernel-dkms nvidia-kernel-open-dkms 2>/dev/null | awk '$1=="ii" {print $3; exit}')
|
||||
if [[ "$dkms_ver" == ${ver}.* ]]; then
|
||||
@@ -288,7 +289,7 @@ _install_nvidia_cuda_repo() {
|
||||
}
|
||||
|
||||
# -------------------------------------------------------------------
|
||||
# Bookworm Kepler intercepción — fuerza nvidia-legacy-470xx-driver
|
||||
# Bookworm Kepler interception — forces nvidia-legacy-470xx-driver
|
||||
# -------------------------------------------------------------------
|
||||
_install_nvidia_bookworm_kepler() {
|
||||
local nv_pkg="nvidia-tesla-470-driver"
|
||||
@@ -297,26 +298,26 @@ _install_nvidia_bookworm_kepler() {
|
||||
|
||||
echo -e "${YELLOW}Kepler GPU detected — forcing ${nv_pkg}.${NC}"
|
||||
|
||||
local msg="Kepler GPU detectada (GKxxx).\n\n"
|
||||
msg+="En Debian 12 Bookworm, Kepler requiere el driver legacy\n"
|
||||
msg+="en lugar del moderno. Se usará el paquete:\n"
|
||||
local msg="Kepler GPU detected (GKxxx).\n\n"
|
||||
msg+="On Debian 12 Bookworm, Kepler requires the legacy\n"
|
||||
msg+="driver instead of the modern one. Using package:\n"
|
||||
msg+=" ${nv_pkg} ${nv_ver:-unknown}\n"
|
||||
msg+="para evitar fallos de pantalla negra.\n\n"
|
||||
msg+="to avoid black-screen failures.\n\n"
|
||||
msg+=" [USE] ${nv_pkg}\n"
|
||||
msg+=" [+] linux-headers-amd64\n"
|
||||
msg+=" [+] firmware-misc-nonfree\n"
|
||||
msg+=" [+] nvidia-settings\n\n"
|
||||
msg+="Instalar driver legacy para Kepler?"
|
||||
msg+="Install the legacy driver for Kepler?"
|
||||
|
||||
if ! _confirm_custom "NVIDIA Kepler — Bookworm" "$msg" "Install" "Skip" 14 70; then
|
||||
echo "Omitiendo driver Kepler."
|
||||
echo "Skipping Kepler driver."
|
||||
NVIDIA_DRIVER_MODE=""
|
||||
return 0
|
||||
fi
|
||||
|
||||
if ! _run_cmd "NVIDIA Kepler" \
|
||||
"sudo apt install -y linux-headers-amd64 $nv_pkg firmware-misc-nonfree nvidia-settings" \
|
||||
"Instalando nvidia-legacy-470xx-driver..."; then
|
||||
"Installing nvidia-legacy-470xx-driver..."; then
|
||||
NVIDIA_DRIVER_MODE=""
|
||||
_msg "NVIDIA Kepler — Error" "Kepler driver installation FAILED.\n\nNo NVIDIA driver was installed." 10 60
|
||||
return 1
|
||||
@@ -332,10 +333,10 @@ _install_nvidia_bookworm_kepler() {
|
||||
# CASE B: Kernel stable (any distro) → Debian stable
|
||||
# -------------------------------------------------------------------
|
||||
_install_nvidia_standard() {
|
||||
# --- 1. ARQUITECTURA → MÓDULO KERNEL ---
|
||||
# Solo Turing+ (conocido) usa el módulo abierto. Arquitectura
|
||||
# unknown/vacía o antigua (Kepler/Fermi/Maxwell/Pascal/Volta) →
|
||||
# módulo cerrado como fallback seguro.
|
||||
# --- 1. ARCHITECTURE → KERNEL MODULE ---
|
||||
# Only Turing+ (known) uses the open module. Unknown/empty or
|
||||
# old architecture (Kepler/Fermi/Maxwell/Pascal/Volta) →
|
||||
# closed module as safe fallback.
|
||||
local fam
|
||||
fam=$(_get_nvidia_arch_family)
|
||||
local kernel_pkg="nvidia-kernel-dkms"
|
||||
@@ -343,12 +344,12 @@ _install_nvidia_standard() {
|
||||
turing | ampere | ada | blackwell) kernel_pkg="nvidia-open-kernel-dkms" ;;
|
||||
esac
|
||||
|
||||
# --- 2. PAQUETES — UN SOLO apt install ---
|
||||
# --- 2. PACKAGES — a single apt install ---
|
||||
local extra_pkgs="linux-headers-amd64 nvidia-driver firmware-nvidia-gsp nvidia-vaapi-driver"
|
||||
[ "$DEBIAN_VERSION" = "12" ] && extra_pkgs+=" mesa-vdpau-drivers"
|
||||
local install_pkgs="$kernel_pkg $extra_pkgs"
|
||||
|
||||
# --- 3. MENSAJE DE CONFIRMACIÓN ---
|
||||
# --- 3. CONFIRMATION MESSAGE ---
|
||||
local kernel_ver msg
|
||||
kernel_ver=$(apt-cache policy "$kernel_pkg" 2>/dev/null | awk 'NR==3 {print $2; exit}') || true
|
||||
|
||||
@@ -364,7 +365,7 @@ _install_nvidia_standard() {
|
||||
return 0
|
||||
fi
|
||||
|
||||
# --- 4. EJECUCIÓN ---
|
||||
# --- 4. EXECUTION ---
|
||||
if ! _run_cmd "NVIDIA" "sudo apt install -y $install_pkgs" \
|
||||
"Installing NVIDIA driver from stable..."; then
|
||||
NVIDIA_DRIVER_MODE=""
|
||||
@@ -373,13 +374,13 @@ _install_nvidia_standard() {
|
||||
fi
|
||||
NVIDIA_DRIVER_MODE="stable"
|
||||
|
||||
# Fix obligatorio para Debian 12 con módulo abierto
|
||||
# Mandatory fix for Debian 12 with the open module
|
||||
if [ "$DEBIAN_VERSION" = "12" ] && [[ "$kernel_pkg" == *"open"* ]]; then
|
||||
echo "options nvidia NVreg_OpenRmEnableUnsupportedGpus=1" | sudo tee /etc/modprobe.d/nvidia-open.conf >/dev/null
|
||||
echo "Applied required Open RM parameter for Debian 12."
|
||||
fi
|
||||
|
||||
# --- 5. VERIFICACIÓN DKMS POST-INSTALL ---
|
||||
# --- 5. DKMS POST-INSTALL VERIFICATION ---
|
||||
echo -e "${GREEN}NVIDIA driver installed. Reboot required.${NC}"
|
||||
_verify_nvidia_dkms_build "$kernel_pkg" || true
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user