From 098f18a504d97fec24bbe619370cdd2ca0d5b500 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 23 Jul 2017 10:28:46 +0200 Subject: Merging upstream version 20170722. Signed-off-by: Daniel Baumann --- share/scripts/debconf.d/0003-debconf.templates | 30 ++++++++++++++++---------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'share/scripts/debconf.d/0003-debconf.templates') diff --git a/share/scripts/debconf.d/0003-debconf.templates b/share/scripts/debconf.d/0003-debconf.templates index e46fa88..e3dbc24 100644 --- a/share/scripts/debconf.d/0003-debconf.templates +++ b/share/scripts/debconf.d/0003-debconf.templates @@ -2,6 +2,14 @@ Template: cnt-debconf/title Type: title Description: container-tools +Template: cnt-debconf/mode +Type: select +Default: +Choices-C: ${CHOICES_C} +Choices: ${CHOICES} +Description: Mode + Mode. + Template: cnt-debconf/distribution Type: select Default: @@ -92,19 +100,19 @@ Default: Description: Root password Root password. -Template: cnt-debconf/network0/bridge +Template: cnt-debconf/network1/bridge Type: string Default: Description: Bridge Bridge. -Template: cnt-debconf/network0/veth +Template: cnt-debconf/network1/veth Type: string Default: Description: Veth name Veth name. -Template: cnt-debconf/network0/ipv4-method +Template: cnt-debconf/network1/ipv4-method Type: select Choices: dhcp, static, none Default: @@ -114,7 +122,7 @@ Description: Ethernet Interface Method (IPv4)? This defaults to dhcp and will require that you run a dhcp-server in your network. -Template: cnt-debconf/network0/ipv4-comment +Template: cnt-debconf/network1/ipv4-comment Type: string Default: Description: Ethernet Interface Comment (IPv4)? @@ -122,7 +130,7 @@ Description: Ethernet Interface Comment (IPv4)? . This defaults to empty. -Template: cnt-debconf/network0/ipv4-address +Template: cnt-debconf/network1/ipv4-address Type: string Default: Description: Ethernet IP Address (IPv4)? @@ -130,7 +138,7 @@ Description: Ethernet IP Address (IPv4)? . This defaults to 192.168.1.2. -Template: cnt-debconf/network0/ipv4-gateway +Template: cnt-debconf/network1/ipv4-gateway Type: string Default: Description: Ethernet Gateway Address (IPv4)? @@ -138,7 +146,7 @@ Description: Ethernet Gateway Address (IPv4)? . This defaults to empty. -Template: cnt-debconf/network0/ipv4-netmask +Template: cnt-debconf/network1/ipv4-netmask Type: string Default: Description: Ethernet Network Mask (IPv4)? @@ -146,19 +154,19 @@ Description: Ethernet Network Mask (IPv4)? . This defaults to empty. -Template: cnt-debconf/network0/ipv4-post-up +Template: cnt-debconf/network1/ipv4-post-up Type: string Default: Description: Ethernet post-up Command (IPv4)? - What should be the post-up command for eth0? + What should be the post-up command for eno1? . This defaults to empty. -Template: cnt-debconf/network0/ipv4-post-down +Template: cnt-debconf/network1/ipv4-post-down Type: string Default: Description: Ethernet post-down Command (IPv4)? - What should be the post-down command for eth0? + What should be the post-down command for eno1? . This defaults to empty. -- cgit v1.2.3