Merge ~danilogondolfo/ubuntu/+source/netplan.io:focal_generator_postinst into ubuntu/+source/netplan.io:ubuntu/focal-devel

[Danilo Egea Gondolfo]

Unmerged commits

2c06c83... by Danilo Egea Gondolfo on 2024-06-28

Changelog

d2fe286... by Danilo Egea Gondolfo on 2024-06-28

debian/netplan.io.postinst

Don't call the generator if no netplan configuration file exists.
(LP: #2071333)

diff --git a/debian/changelog b/debian/changelog
index fea6a3b..b894b45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+netplan.io (0.104-0ubuntu2~20.04.6) focal; urgency=medium
+
+  * debian/netplan.io.postinst:
+    Don't call the generator if no networkd configuration file exists.
+    (LP: #2071333)
+
+ -- Danilo Egea Gondolfo <[e-mail]>  Fri, 28 Jun 2024 10:43:21 +0100
+
 netplan.io (0.104-0ubuntu2~20.04.5) focal-security; urgency=medium
 
   * SECURITY UPDATE: weak permissions on secret files, command injection
diff --git a/debian/netplan.io.postinst b/debian/netplan.io.postinst
index d76598a..b3554f5 100644
--- a/debian/netplan.io.postinst
+++ b/debian/netplan.io.postinst
@@ -3,8 +3,12 @@
 set -e
 
 # Calling the generator after installation to mitigate CVE-2022-4968
+# We avoid calling the generator if the system doesn't have networkd files to be fixed (LP: #2071333)
 if [ "$1" = configure ]; then
-    /usr/lib/netplan/generate 2>/dev/null || echo "WARNING: Netplan could not re-generate network configuration. Please run 'netplan generate' to see details."
+    FILES=$(find /run/systemd/network/ -type f -regex ".*-netplan.*\.\(network\|netdev\)" 2>/dev/null || true)
+    if [ -n "${FILES}" ]; then
+        /usr/lib/netplan/generate 2>/dev/null || echo "WARNING: Netplan could not re-generate network configuration. Please run 'netplan generate' to see details."
+    fi
 fi
 
 #DEBHELPER#