Using default eno1 instead of eth0 as default container interface.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>

3 files changed, 27 insertions, 27 deletions

diff --git a/share/doc/HOST-SETUP.txt b/share/doc/HOST-SETUP.txt
index b5f8851..e172ee3 100644
--- a/share/doc/HOST-SETUP.txt
+++ b/share/doc/HOST-SETUP.txt
@@ -52,11 +52,11 @@ source /etc/network/interfaces.d/*
 auto lo
 iface lo inet loopback
 
-iface eth0 inet manual
+iface eno1 inet manual
 
 allow-hotplug bridge0
 iface bridge0 inet dhcp
-	bridge_ports	eth0
+	bridge_ports	eno1
 	bridge_fd	0
 	bridge_maxwait	0
 	bridge_stp	0
@@ -74,7 +74,7 @@ source /etc/network/interfaces.d/*
 auto lo
 iface lo inet loopback
 
-iface eth0 inet manual
+iface eno1 inet manual
 
 allow-hotplug bridge0
 iface bridge0 inet static
@@ -82,10 +82,10 @@ iface bridge0 inet static
 	gateway		10.0.0.1
 	netmask		255.255.255.0
 
-	pre-up		ifconfig eth0 down
-	pre-up		ifconfig eth0 up
+	pre-up		ifconfig eno1 down
+	pre-up		ifconfig eno1 up
 
-	bridge_ports	eth0
+	bridge_ports	eno1
 	bridge_fd	0
 	bridge_maxwait	0
 	bridge_stp	0
@@ -103,8 +103,8 @@ source /etc/network/interfaces.d/*
 auto lo
 iface lo inet loopback
 
-allow-hotplug eth0
-iface eth0 inet dhcp
+allow-hotplug eno1
+iface eno1 inet dhcp
 
 allow-hotplug bridge0
 iface bridge0 inet static
@@ -131,19 +131,19 @@ source /etc/network/interfaces.d/*
 auto lo
 iface lo inet loopback
 
-allow-hotplug eth0
-iface eth0 inet dhcp
+allow-hotplug eno1
+iface eno1 inet dhcp
 
-iface eth1 inet manual
+iface eno2 inet manual
 
-iface eth2 inet manual
+iface eno3 inet manual
 
 allow-hotplug bond0
 iface bond0 inet manual
 	up			ifconfig bond0 0.0.0.0 up
 	down			ifconfig bond0 down
 
-	slaves			eth1 eth2
+	slaves			eno2 eno3
 
 	bond-mode		4
 	bond-miimon		100
diff --git a/share/scripts/debconf b/share/scripts/debconf
index d338abc..a31c605 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -828,22 +828,22 @@ Configure_systemd_networkd ()
 		IPV4_SUFFIX="$(CIDR ${IPV4_NETMASK})"
 		IPV4_CIDR="${IPV4_ADDRESS}/${IPV4_SUFFIX}"
 
-cat > "${DIRECTORY}/etc/systemd/network/eth${NUMBER}.network" << EOF
+cat > "${DIRECTORY}/etc/systemd/network/eno${NUMBER}.network" << EOF
 [Match]
-Name=eth${NUMBER}
+Name=eno${NUMBER}
 
 [Network]
 EOF
 
 		if [ -n "${IPV4_COMMENT}" ]
 		then
-			echo "Description=${IPV4_COMMENT}" >> "${DIRECTORY}/etc/systemd/network/eth${NUMBER}.network"
+			echo "Description=${IPV4_COMMENT}" >> "${DIRECTORY}/etc/systemd/network/eno${NUMBER}.network"
 		fi
 
 		case "${IPV4_METHOD}" in
 			dhcp)
 
-cat >> "${DIRECTORY}/etc/systemd/network/eth${NUMBER}.network" << EOF
+cat >> "${DIRECTORY}/etc/systemd/network/eno${NUMBER}.network" << EOF
 DHCP=ipv4
 EOF
 
@@ -851,7 +851,7 @@ EOF
 
 			static)
 
-cat >> "${DIRECTORY}/etc/systemd/network/eth${NUMBER}.network" << EOF
+cat >> "${DIRECTORY}/etc/systemd/network/eno${NUMBER}.network" << EOF
 DHCP=no
 Address=${IPV4_CIDR}
 EOF
@@ -859,7 +859,7 @@ EOF
 				if [ -n "${IPV4_GATEWAY}" ]
 				then
 
-cat >> "${DIRECTORY}/etc/systemd/network/eth${NUMBER}.network" << EOF
+cat >> "${DIRECTORY}/etc/systemd/network/eno${NUMBER}.network" << EOF
 Gateway=${IPV4_GATEWAY}
 EOF
 
@@ -869,7 +869,7 @@ EOF
 		if [ -n "${IPV4_POST_UP}" ]
 		then
 
-cat > "${DIRECTORY}/etc/systemd/system/cnt-ipv4-post-up-eth${NUMBER}.service" << EOF
+cat > "${DIRECTORY}/etc/systemd/system/cnt-ipv4-post-up-eno${NUMBER}.service" << EOF
 [Unit]
 Description=container-tools IPV4_POST_UP
 After=network-online.target
@@ -883,13 +883,13 @@ ExecStart=/bin/sh -c "${IPV4_POST_UP}"
 WantedBy=multi-user.target
 EOF
 
-			chroot "${DIRECTORY}" systemctl enable cnt-ipv4-post-up-eth${NUMBER}.service
+			chroot "${DIRECTORY}" systemctl enable cnt-ipv4-post-up-eno${NUMBER}.service
 		fi
 
 		if [ -n "${IPV4_POST_DOWN}" ]
 		then
 
-cat > "${DIRECTORY}/etc/systemd/system/cnt-ipv4-post-down-eth${NUMBER}.service" << EOF
+cat > "${DIRECTORY}/etc/systemd/system/cnt-ipv4-post-down-eno${NUMBER}.service" << EOF
 [Unit]
 Description=container-tools IPV4_POST_DOWN
 After=network.target
@@ -903,7 +903,7 @@ ExecStart=/bin/sh -c "${IPV4_POST_DOWN}"
 WantedBy=multi-user.target
 EOF
 
-			chroot "${DIRECTORY}" systemctl enable cnt-ipv4-post-down-eth${NUMBER}.service
+			chroot "${DIRECTORY}" systemctl enable cnt-ipv4-post-down-eno${NUMBER}.service
 		fi
 
 		NUMBER="$((${NUMBER} + 1))"
@@ -937,7 +937,7 @@ Commands ()
 		-e "s|^cnt.overlay=.*|cnt.overlay=${CNT_OVERLAY}|g" \
 		-e "s|^bind=.*|bind=${BIND}|g" \
 		-e "s|^bind-ro=.*|bind-ro=${BIND_RO}|g" \
-		-e "s|^network-veth-extra=.*|network-veth-extra=${HOST_INTERFACE_NAME}:eth0|g" \
+		-e "s|^network-veth-extra=.*|network-veth-extra=${HOST_INTERFACE_NAME}:eno1|g" \
 	"${CONFIG}/${NAME}.conf"
 
 	for NUMBER in $(seq 1 ${NETWORK_NUMBER})
@@ -952,7 +952,7 @@ Commands ()
 		eval HOST_INTERFACE_NAME="$`echo NETWORK${NUMBER}_VETH`"
 
 		HOST_INTERFACE_NAME="$(echo ${HOST_INTERFACE_NAME:-veth-${HOSTNAME_SHORT}-${NUMBER}})"
-		CONTAINER_INTERFACE_NAME="eth${NUMBER}"
+		CONTAINER_INTERFACE_NAME="eno${NUMBER}"
 
 		sed -i -e "/^register=.*/ a network-veth-extra=${HOST_INTERFACE_NAME}:${CONTAINER_INTERFACE_NAME}" "${CONFIG}/${NAME}.conf"
 
diff --git a/share/scripts/debconf.d/0003-debconf.templates b/share/scripts/debconf.d/0003-debconf.templates
index 61b8154..f091f47 100644
--- a/share/scripts/debconf.d/0003-debconf.templates
+++ b/share/scripts/debconf.d/0003-debconf.templates
@@ -158,7 +158,7 @@ Template: cnt-debconf/network0/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.
 
@@ -166,7 +166,7 @@ Template: cnt-debconf/network0/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.