diff options
| author | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2017-07-22 10:28:22 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2017-07-22 22:28:26 +0000 |
| commit | 2b9365d238be074267d2cc41717ec4f530a4d71e (patch) | |
| tree | b6800d1358410192e2fd3b270d5c0fb9729c550e /share | |
| parent | Adding cnt-debconf/mode preseed field to allow embedding container create scr... (diff) | |
| download | compute-tools-2b9365d238be074267d2cc41717ec4f530a4d71e.tar.xz compute-tools-2b9365d238be074267d2cc41717ec4f530a4d71e.zip | |
Using default bridge0 instead of br0 as default bridge interface.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to '')
| -rw-r--r-- | share/doc/HOST-SETUP.txt | 16 | ||||
| -rw-r--r-- | share/doc/examples/dschinn-backports.cfg | 2 | ||||
| -rw-r--r-- | share/doc/examples/stretch.cfg | 2 | ||||
| -rwxr-xr-x | share/scripts/debconf | 4 | ||||
| -rwxr-xr-x | share/scripts/debconf.d/0003-debconf | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/share/doc/HOST-SETUP.txt b/share/doc/HOST-SETUP.txt index 72d42d5..b5f8851 100644 --- a/share/doc/HOST-SETUP.txt +++ b/share/doc/HOST-SETUP.txt @@ -54,8 +54,8 @@ iface lo inet loopback iface eth0 inet manual -allow-hotplug br0 -iface br0 inet dhcp +allow-hotplug bridge0 +iface bridge0 inet dhcp bridge_ports eth0 bridge_fd 0 bridge_maxwait 0 @@ -76,8 +76,8 @@ iface lo inet loopback iface eth0 inet manual -allow-hotplug br0 -iface br0 inet static +allow-hotplug bridge0 +iface bridge0 inet static address 10.0.0.2 gateway 10.0.0.1 netmask 255.255.255.0 @@ -106,13 +106,13 @@ iface lo inet loopback allow-hotplug eth0 iface eth0 inet dhcp -allow-hotplug br0 -iface br0 inet static +allow-hotplug bridge0 +iface bridge0 inet static address 10.0.0.1 netmask 255.255.255.0 - pre-up brctl addbr br0 - post-down brctl delbr br0 + pre-up brctl addbr bridge0 + post-down brctl delbr bridge0 bridge_fd 0 bridge_maxwait 0 diff --git a/share/doc/examples/dschinn-backports.cfg b/share/doc/examples/dschinn-backports.cfg index 367d874..c1c3ba5 100644 --- a/share/doc/examples/dschinn-backports.cfg +++ b/share/doc/examples/dschinn-backports.cfg @@ -31,7 +31,7 @@ container-tools cnt-debconf/root-password string progress #container-tools cnt-debconf/root-password-crypted string # Network IP configuration -container-tools cnt-debconf/network0/bridge string br0 +container-tools cnt-debconf/network0/bridge string bridge0 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 diff --git a/share/doc/examples/stretch.cfg b/share/doc/examples/stretch.cfg index c355a80..3cd69d6 100644 --- a/share/doc/examples/stretch.cfg +++ b/share/doc/examples/stretch.cfg @@ -30,5 +30,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/network0/bridge string br0 +container-tools cnt-debconf/network0/bridge string bridge0 #container-tools cnt-debconf/network-mac string diff --git a/share/scripts/debconf b/share/scripts/debconf index e97f41e..d338abc 100755 --- a/share/scripts/debconf +++ b/share/scripts/debconf @@ -933,7 +933,7 @@ Commands () sed -i -e "s|^cnt.auto=.*|cnt.auto=${CNT_AUTO}|g" \ -e "s|^cnt.container-server=.*|cnt.container-server=${CNT_CONTAINER_SERVER}|g" \ - -e "s|^cnt.network-bridge=.*|cnt.network-bridge=${HOST_INTERFACE_NAME}:${NETWORK0_BRIDGE:-br0}|g" \ + -e "s|^cnt.network-bridge=.*|cnt.network-bridge=${HOST_INTERFACE_NAME}:${NETWORK0_BRIDGE:-bridge0}|g" \ -e "s|^cnt.overlay=.*|cnt.overlay=${CNT_OVERLAY}|g" \ -e "s|^bind=.*|bind=${BIND}|g" \ -e "s|^bind-ro=.*|bind-ro=${BIND_RO}|g" \ @@ -957,7 +957,7 @@ Commands () sed -i -e "/^register=.*/ a network-veth-extra=${HOST_INTERFACE_NAME}:${CONTAINER_INTERFACE_NAME}" "${CONFIG}/${NAME}.conf" eval BRIDGE="$`echo NETWORK${NUMBER}_BRIDGE`" - sed -i -e "/^register=.*/ a cnt.network-bridge=${HOST_INTERFACE_NAME}:${BRIDGE:-br${NUMBER}}" "${CONFIG}/${NAME}.conf" + sed -i -e "/^register=.*/ a cnt.network-bridge=${HOST_INTERFACE_NAME}:${BRIDGE:-bridge${NUMBER}}" "${CONFIG}/${NAME}.conf" done # Setting root password diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf index 007ddfb..9640620 100755 --- a/share/scripts/debconf.d/0003-debconf +++ b/share/scripts/debconf.d/0003-debconf @@ -697,7 +697,7 @@ Network_defaults () VETH_NAME="$(echo ${HOSTNAME_SHORT:-veth0})" NETWORK0_VETH="${NETWORK0_VETH:-$VETH_NAME}" - NETWORK0_BRIDGE="${NETWORK0_BRIDGE:-br0}" + NETWORK0_BRIDGE="${NETWORK0_BRIDGE:-bridge0}" NETWORK0_IPV4_METHOD="${NETWORK0_IPV4_METHOD:-dhcp}" NETWORK0_IPV4_ADDRESS="${NETWORK0_IPV4_ADDRESS:-192.168.1.2}" NETWORK0_IPV4_NETMASK="${NETWORK0_IPV4_NETMASK:-255.255.255.0}" |