From dceff5dd1d47962fa716c2d212aa65099e4f5669 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 4 Jun 2022 07:23:14 +0200
Subject: Merging upstream version 20220604.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 share/build-scripts/debconf                        | 19 +++++++++++++++
 share/build-scripts/debconf.d/0003-debconf         | 28 ++++++++++++++++++++++
 .../build-scripts/debconf.d/0003-debconf.templates |  4 ++--
 3 files changed, 49 insertions(+), 2 deletions(-)

(limited to 'share/build-scripts')

diff --git a/share/build-scripts/debconf b/share/build-scripts/debconf
index 1689a79..168f985 100755
--- a/share/build-scripts/debconf
+++ b/share/build-scripts/debconf
@@ -880,6 +880,14 @@ EOF
 
 					fi
 					;;
+
+				stub)
+
+cat >> "${DIRECTORY}/etc/systemd/network/eno${NUMBER}.network" << EOF
+DHCP=no
+EOF
+
+					;;
 			esac
 
 			if [ -n "${IPV4_POST_UP}" ]
@@ -950,6 +958,7 @@ EOF
 cat >> "${DIRECTORY}/etc/systemd/network/eno${NUMBER}.network" << EOF
 DHCP=no
 IPv6AcceptRA=no
+LinkLocalAddressing=no
 Address=${IPV6_ADDRESS}/${IPV6_NETMASK}
 EOF
 
@@ -962,6 +971,16 @@ EOF
 
 					fi
 					;;
+
+				stub)
+
+cat >> "${DIRECTORY}/etc/systemd/network/eno${NUMBER}.network" << EOF
+DHCP=no
+IPv6AcceptRA=no
+LinkLocalAddressing=no
+EOF
+
+					;;
 			esac
 
 			if [ -n "${IPV6_POST_UP}" ]
diff --git a/share/build-scripts/debconf.d/0003-debconf b/share/build-scripts/debconf.d/0003-debconf
index 2b0ea76..d428228 100755
--- a/share/build-scripts/debconf.d/0003-debconf
+++ b/share/build-scripts/debconf.d/0003-debconf
@@ -864,6 +864,20 @@ Network ()
 			db_input high container/network1/ipv4-post-up || true
 			db_go
 
+			db_settitle container/title
+			db_input high container/network1/ipv4-post-down || true
+			db_go
+			;;
+
+		stub)
+			db_settitle container/title
+			db_input high container/network1/ipv4-comment || true
+			db_go
+
+			db_settitle container/title
+			db_input high container/network1/ipv4-post-up || true
+			db_go
+
 			db_settitle container/title
 			db_input high container/network1/ipv4-post-down || true
 			db_go
@@ -902,6 +916,20 @@ Network ()
 			db_input high container/network1/ipv6-post-up || true
 			db_go
 
+			db_settitle container/title
+			db_input high container/network1/ipv6-post-down || true
+			db_go
+			;;
+
+		stub)
+			db_settitle container/title
+			db_input high container/network1/ipv6-comment || true
+			db_go
+
+			db_settitle container/title
+			db_input high container/network1/ipv6-post-up || true
+			db_go
+
 			db_settitle container/title
 			db_input high container/network1/ipv6-post-down || true
 			db_go
diff --git a/share/build-scripts/debconf.d/0003-debconf.templates b/share/build-scripts/debconf.d/0003-debconf.templates
index 73952a8..098acd1 100644
--- a/share/build-scripts/debconf.d/0003-debconf.templates
+++ b/share/build-scripts/debconf.d/0003-debconf.templates
@@ -112,7 +112,7 @@ Description: Veth name
 
 Template: container/network1/ipv4-method
 Type: select
-Choices: dhcp, static, none
+Choices: dhcp, static, stub, none
 Default:
 Description: Ethernet Interface Method (IPv4)?
  What method should be used to configure the ethernet interface?
@@ -173,7 +173,7 @@ Description: Ethernet post-down Command (IPv4)?
 
 Template: container/network1/ipv6-method
 Type: select
-Choices: static, none
+Choices: dhcp, static, stub, none
 Default:
 Description: Ethernet Interface Method (IPv6)?
  What method should be used to configure the ethernet interface?
-- 
cgit v1.2.3