From 34a0dae3e6cfdc3572e21a9bae89bc618dfe0313 Mon Sep 17 00:00:00 2001
From: Ludovic Poujol <lpoujol@evolix.fr>
Date: Wed, 29 Mar 2023 11:41:26 +0200
Subject: [PATCH] generate-ldif: Support for Debian 12

The script required few changes to adapt to the new output of lscpu & usage of lspci

lscpu
- Multiple Vendor ID fields (CPU & Bios) > We keep the first one tied to the CPU info
- No more CPU Speed displayed for virtual machines. We guess the CPU Speed with the CPU Name (Thanks intel puting it in the CPU Name). But that's not going to work with AMD CPUs. An alternative would be to have a peek at /proc/cpu

lspci
- Remove the "0x" prefix as it seems invalid with lscpi version on Debian 12. On older debian, vendor/device id are accepted with or without the "0x" prefix
---
 CHANGELOG.md                               |  2 ++
 generate-ldif/templates/generateldif.sh.j2 | 24 +++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea1a712f..65fc4ab1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,8 @@ The **patch** part changes is incremented if multiple releases happen the same m
 
 ### Fixed
 
+* generate-ldif: Support for Debian 12
+
 ### Removed
 
 ### Security
diff --git a/generate-ldif/templates/generateldif.sh.j2 b/generate-ldif/templates/generateldif.sh.j2
index 229c1443..e306f075 100755
--- a/generate-ldif/templates/generateldif.sh.j2
+++ b/generate-ldif/templates/generateldif.sh.j2
@@ -40,27 +40,27 @@ if [ "$type" = "kvm" ]; then
     HardwareMark="KVM"
     HardwareModel="Virtual Machine"
 
-    cpuMark=$(lscpu | grep Vendor | tr -s '\t' ' ' | cut -d' ' -f3)
-    cpuModel="Virtual $(lscpu | grep "Model name" | tr -s '\t' ' ' | cut -d' ' -f3-), $(nproc) vCPU"
-    cpuFreq="$(lscpu | grep "CPU MHz" | tr -s '\t' ' ' | cut -d' ' -f3-)MHz"
+    cpuMark=$(lscpu | grep "Vendor ID:" | head -n1 | tr -s '\t' ' ' | cut -d' ' -f3)
+    cpuModel="Virtual $(lscpu | grep "Model name" | head -n1 | tr -s '\t' ' ' | cut -d' ' -f3-), $(nproc) vCPU"
+    cpuFreq="$(lscpu | grep "GHz" | head -n1 |  tr -s '\t' ' ' | cut -d'@' -f2 | tr -d ' ')"
 
 elif [ "$type" = "vmware" ]; then
     ComputerType="VM"
     HardwareMark="VMWare"
     HardwareModel="Virtual Machine"
 
-    cpuMark=$(lscpu | grep Vendor | tr -s '\t' ' ' | cut -d' ' -f3)
-    cpuModel="Virtual $(lscpu | grep "Model name" | tr -s '\t' ' ' | cut -d' ' -f3-), $(nproc) vCPU"
-    cpuFreq="$(lscpu | grep "CPU MHz" | tr -s '\t' ' ' | cut -d' ' -f3-)MHz"
+    cpuMark=$(lscpu | grep "Vendor ID:" | head -n1 | tr -s '\t' ' ' | cut -d' ' -f3)
+    cpuModel="Virtual $(lscpu | grep "Model name" | head -n1 | tr -s '\t' ' ' | cut -d' ' -f3-), $(nproc) vCPU"
+    cpuFreq="$(lscpu | grep "GHz" | head -n1 |  tr -s '\t' ' ' | cut -d'@' -f2 | tr -d ' ')"
 
 elif [ "$type" = "virtualbox" ]; then
     ComputerType="VM"
     HardwareMark="VirtualBox"
     HardwareModel="Virtual Machine"
 
-    cpuMark=$(lscpu | grep Vendor | tr -s '\t' ' ' | cut -d' ' -f3)
-    cpuModel="Virtual $(lscpu | grep "Model name" | tr -s '\t' ' ' | cut -d' ' -f3-), $(nproc) vCPU"
-    cpuFreq="$(lscpu | grep "CPU MHz" | tr -s '\t' ' ' | cut -d' ' -f3-)MHz"
+    cpuMark=$(lscpu | grep "Vendor ID:" | head -n1 | tr -s '\t' ' ' | cut -d' ' -f3)
+    cpuModel="Virtual $(lscpu | grep "Model name" | head -n1 | tr -s '\t' ' ' | cut -d' ' -f3-), $(nproc) vCPU"
+    cpuFreq="$(lscpu | grep "GHz" | head -n1 |  tr -s '\t' ' ' | cut -d'@' -f2 | tr -d ' ')"
 else
     ComputerType="Baremetal"
     HardwareModel=$(dmidecode -s system-product-name | grep -v '^#')
@@ -307,10 +307,10 @@ for net in $(ls /sys/class/net); do
         hw=$(cat ${path}/address)
         # In some cases some devices does not have a vendor or device, skip it
         test -f ${path}/device/vendor || continue
-        vendor_id=$(cat ${path}/device/vendor)
+        vendor_id=$(cat ${path}/device/vendor | sed -E 's/^0x//g')
         test -f ${path}/device/device || continue
-        dev_id=$(cat ${path}/device/device)
-        [ "${dev_id}" = "0x0001" ] && dev_id="0x1000"
+        dev_id=$(cat ${path}/device/device | sed -E 's/^0x//g')
+        [ "${dev_id}" = "0001" ] && dev_id="1000"
         dev=$(lspci -d "${vendor_id}:${dev_id}" -vm)
         vendor=$(echo "${dev}" | grep -E "^Vendor" | cut -d':' -f2 | xargs)
         model=$(echo "${dev}" | grep -E "^Vendor" -A1 | grep -E "^Device" | cut -d':' -f2 | xargs)