fix(os): parse /etc/os-release line-by-line instead of regex
All checks were successful
Build and Release .deb / build-deb (push) Successful in 22s

- pct exec returns stdout differently than local cat
- Line-by-line parsing is more robust across LXC boundaries
- Handles quotes correctly
This commit is contained in:
enzo 2026-05-13 04:10:01 +02:00
parent f0f59f0468
commit c1f462d209

View file

@ -140,43 +140,38 @@ def scan_os(target: Target) -> str:
"""Récupère le nom, la version complète et le codename de l'OS.""" """Récupère le nom, la version complète et le codename de l'OS."""
prefix = [] if target.is_host else ["pct", "exec", target.target_id, "--"] prefix = [] if target.is_host else ["pct", "exec", target.target_id, "--"]
# 1. Lire /etc/os-release # 1. Lire /etc/os-release et parser ligne par ligne
ok, osrel_out, _ = run_cmd(prefix + ["cat", "/etc/os-release"], timeout=30) ok, osrel_out, _ = run_cmd(prefix + ["cat", "/etc/os-release"], timeout=30)
version_id = "" os_data = {}
pretty_name = ""
codename = ""
if ok: if ok:
# Priorité 1 : DEBIAN_VERSION_FULL (ex: 13.4) for line in osrel_out.splitlines():
ver_full_match = re.search(r'DEBIAN_VERSION_FULL="?([^"\n]+)"?', osrel_out) line = line.strip()
if ver_full_match: if "=" in line:
version_id = ver_full_match.group(1).strip() key, val = line.split("=", 1)
# Priorité 2 : VERSION (ex: "13 (trixie)") # Supprimer les guillemets
if not version_id: val = val.strip().strip('"').strip("'")
ver_match = re.search(r'VERSION="([^"]+)"', osrel_out) os_data[key] = val
if ver_match:
version_id = ver_match.group(1).strip()
# Priorité 3 : VERSION_ID (ex: "13")
if not version_id:
ver_match = re.search(r'VERSION_ID="([^"]+)"', osrel_out)
if ver_match:
version_id = ver_match.group(1).strip()
# Nom affichable
pretty_match = re.search(r'PRETTY_NAME="([^"]+)"', osrel_out)
if pretty_match:
pretty_name = pretty_match.group(1).strip()
# Codename
code_match = re.search(r'VERSION_CODENAME="?([^"\n]+)"?', osrel_out)
if code_match:
codename = code_match.group(1).strip()
# 2. Fallback sur /etc/debian_version si tout vide # 2. Extraire les champs
version_id = os_data.get("DEBIAN_VERSION_FULL", "")
if not version_id:
version_id = os_data.get("VERSION", "")
if not version_id:
version_id = os_data.get("VERSION_ID", "")
codename = os_data.get("VERSION_CODENAME", "")
pretty_name = os_data.get("PRETTY_NAME", "")
os_name = os_data.get("NAME", "")
# 3. Fallback sur /etc/debian_version si tout vide
if not version_id: if not version_id:
ok, ver_out, _ = run_cmd(prefix + ["cat", "/etc/debian_version"], timeout=30) ok, ver_out, _ = run_cmd(prefix + ["cat", "/etc/debian_version"], timeout=30)
version_id = ver_out.strip() if ok else "" version_id = ver_out.strip() if ok else ""
# 3. Récupérer le nom via lsb_release # 4. Fallback sur lsb_release pour le nom
ok, name_out, _ = run_cmd(prefix + ["lsb_release", "-is"], timeout=30) if not os_name:
os_name = name_out.strip() if ok else "" ok, name_out, _ = run_cmd(prefix + ["lsb_release", "-is"], timeout=30)
os_name = name_out.strip() if ok else ""
if not os_name and pretty_name: if not os_name and pretty_name:
return pretty_name return pretty_name