From 803be36b96ec28b84894efaa279714914c36667c Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 22 Sep 2016 16:11:28 +0100 Subject: [PATCH] net: consolidate DHCP onto eth0 only - rename DfW main interface eth0 - remove eth1 DHCP config - create tap device in init script not interfaces file Signed-off-by: Rolf Neugebauer --- alpine/Dockerfile | 1 + alpine/etc/network/interfaces | 7 ------- alpine/packages/tap-vsockd/etc/init.d/tap-vsockd | 1 + 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index f00f4ae95..9d433bd9b 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -20,6 +20,7 @@ RUN \ rc-update add vsudd boot && \ rc-update add sysklogd boot && \ rc-update add hwclock boot && \ + rc-update add tap-vsockd boot && \ rc-update add networking boot && \ rc-update add acpid default && \ rc-update add chronyd default && \ diff --git a/alpine/etc/network/interfaces b/alpine/etc/network/interfaces index 448065704..16bf29af8 100644 --- a/alpine/etc/network/interfaces +++ b/alpine/etc/network/interfaces @@ -4,10 +4,3 @@ iface lo inet loopback auto eth0 iface eth0 inet dhcp udhcpc_opts -T 3 -A 3 -t 20 -O search - -auto eth1 -iface eth1 inet dhcp - udhcpc_opts -T 1 -A 3 - metric 199 - pre-up service tap-vsockd start - post-down service tap-vsockd stop diff --git a/alpine/packages/tap-vsockd/etc/init.d/tap-vsockd b/alpine/packages/tap-vsockd/etc/init.d/tap-vsockd index 6a71dfb2c..0886276ed 100755 --- a/alpine/packages/tap-vsockd/etc/init.d/tap-vsockd +++ b/alpine/packages/tap-vsockd/etc/init.d/tap-vsockd @@ -23,6 +23,7 @@ start() --background \ --pidfile ${PIDFILE} \ -- \ + --tap eth0 \ --pidfile "${PIDFILE}" \ --listen