From b90ddebe1d1cb49c30c3a9d99119e3b0d14995fd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 18 May 2016 20:28:46 +0200 Subject: Merging upstream version 20160515. Signed-off-by: Daniel Baumann --- share/doc/examples/cairon-backports.cfg | 1 + share/doc/examples/jessie.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'share/doc/examples') diff --git a/share/doc/examples/cairon-backports.cfg b/share/doc/examples/cairon-backports.cfg index 2fca922..dd459f2 100644 --- a/share/doc/examples/cairon-backports.cfg +++ b/share/doc/examples/cairon-backports.cfg @@ -30,6 +30,7 @@ container-tools cnt-debconf/root-password string progress # Network IP configuration container-tools cnt-debconf/network0/bridge string br0 +container-tools cnt-debconf/network0/veth string veth0 container-tools cnt-debconf/network0/ipv4-method select static container-tools cnt-debconf/network0/ipv4-comment string Primary network interfaces container-tools cnt-debconf/network0/ipv4-address string 192.168.0.2 diff --git a/share/doc/examples/jessie.cfg b/share/doc/examples/jessie.cfg index e9f9d46..0ec33e6 100644 --- a/share/doc/examples/jessie.cfg +++ b/share/doc/examples/jessie.cfg @@ -28,5 +28,5 @@ container-tools cnt-debconf/packages string openssh-server container-tools cnt-debconf/root-password string debian #container-tools cnt-debconf/root-password-crypted string -container-tools cnt-debconf/network-bridge string br0 +container-tools cnt-debconf/network0/bridge string br0 #container-tools cnt-debconf/network-mac string -- cgit v1.2.3