summaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-06-28 16:00:49 +0200
committerTom Gundersen <teg@jklm.no>2014-06-29 15:18:21 +0200
commited942a9eb22d50f667909ad6184b45015d28d054 (patch)
tree760aa4ceb830afc515d98dfc6539cbefd48bfd6c /network
parent68ceb9df6a39a7f86ffc3cf8266ca677a5d5271b (diff)
downloadsystemd-ed942a9eb22d50f667909ad6184b45015d28d054.tar.gz
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.
Diffstat (limited to 'network')
-rw-r--r--network/80-container-host0.network3
1 files changed, 1 insertions, 2 deletions
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