Merge ~danilogondolfo/ubuntu/+source/netplan.io:noble_generator_postinst into ubuntu/+source/netplan.io:ubuntu/noble-devel

[Danilo Egea Gondolfo]

Unmerged commits

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

Changelog

9b09cb5... by Danilo Egea Gondolfo on 2024-06-28

debian/netplan-generator.postinst

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

diff --git a/debian/changelog b/debian/changelog
index 433b999..34d7277 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+netplan.io (1.0-2ubuntu1.2) noble; urgency=medium
+
+  * debian/netplan-generator.postinst: Don't call the generator if no networkd
+    configuration file exists. (LP: #2071333)
+
+ -- Danilo Egea Gondolfo <[e-mail]>  Fri, 28 Jun 2024 09:41:13 +0100
+
 netplan.io (1.0-2ubuntu1.1) noble-security; urgency=medium
 
   * SECURITY UPDATE: weak permissions on secret files, command injection
diff --git a/debian/netplan-generator.postinst b/debian/netplan-generator.postinst
index 5592e22..e64693c 100644
--- a/debian/netplan-generator.postinst
+++ b/debian/netplan-generator.postinst
@@ -9,5 +9,13 @@ if [ "$1" = configure ] || [ "$1" = abort-upgrade ]; then
 fi
 # end-remove-after
 
-#DEBHELPER#
+# 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
+    FILES=$(find /run/systemd/network/ -type f -regex ".*-netplan.*\.\(network\|netdev\)")
+    if [ -n "${FILES}" ]; then
+        /usr/libexec/netplan/generate 2>/dev/null || echo "WARNING: Netplan could not re-generate network configuration. Please run 'netplan generate' to see details."
+    fi
+fi
 
+#DEBHELPER#