From ed942a9eb22d50f667909ad6184b45015d28d054 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Sat, 28 Jun 2014 16:00:49 +0200
Subject: networkd: merge DHCPv4 and DHCPv6 config

If there are v4 or v6 specific options we can keep those in separate sections,
but for the common options, we will use only one.

Moreovere only use DHCP=[yes/both|no/none|v4|v6] to enable or disable the clients.
---
 network/80-container-host0.network | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'network')

diff --git a/network/80-container-host0.network b/network/80-container-host0.network
index 76c0f1db4b..6863ca9ce9 100644
--- a/network/80-container-host0.network
+++ b/network/80-container-host0.network
@@ -10,6 +10,5 @@ Virtualization=container
 Name=host0
 
 [Network]
-DHCP=yes
-DHCPv6=yes
+DHCP=both
 IPv4LL=yes
-- 
cgit v1.2.1