summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-28 15:38:04 +0000
committerGerrit Code Review <review@openstack.org>2017-01-28 15:38:04 +0000
commit02b1c8ec5ef0573695dff902ee505ae7c7de25f0 (patch)
tree788df310fe0465c3a76ff9ab8e983d82bbce3fc0
parent9698c519c7e666d7648f45682266b75307ef4a23 (diff)
parentb355c01d5c0d3b232554b7d371816c9dc0390111 (diff)
Merge "Support DHCPv6"
-rw-r--r--common-files/etc/network/interfaces4
-rw-r--r--conf/buildroot-client.config2
-rw-r--r--conf/buildroot-debug.config2
-rw-r--r--conf/buildroot-server.config2
4 files changed, 10 insertions, 0 deletions
diff --git a/common-files/etc/network/interfaces b/common-files/etc/network/interfaces
index e70b502..e01d4e1 100644
--- a/common-files/etc/network/interfaces
+++ b/common-files/etc/network/interfaces
@@ -4,3 +4,7 @@ iface lo inet loopback
4 4
5auto eth0 5auto eth0
6iface eth0 inet dhcp 6iface eth0 inet dhcp
7
8iface eth0 inet6 manual
9 up dhcpcd -b -6 eth0
10 down kill `cat /var/run/dhcpcd-eth0-6.pid` 2>/dev/null
diff --git a/conf/buildroot-client.config b/conf/buildroot-client.config
index b817048..a169b7b 100644
--- a/conf/buildroot-client.config
+++ b/conf/buildroot-client.config
@@ -19,7 +19,9 @@ BR2_PACKAGE_NFS_UTILS_RPC_LOCKD=y
19BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD=y 19BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD=y
20BR2_PACKAGE_NFS_UTILS_NFS4=y 20BR2_PACKAGE_NFS_UTILS_NFS4=y
21BR2_PACKAGE_LIBICONV=y 21BR2_PACKAGE_LIBICONV=y
22BR2_PACKAGE_DHCPCD=y
22BR2_PACKAGE_DROPBEAR=y 23BR2_PACKAGE_DROPBEAR=y
24BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS=y
23BR2_PACKAGE_IPROUTE2=y 25BR2_PACKAGE_IPROUTE2=y
24BR2_TARGET_SYSLINUX=y 26BR2_TARGET_SYSLINUX=y
25BR2_TARGET_SYSLINUX_MBR=y 27BR2_TARGET_SYSLINUX_MBR=y
diff --git a/conf/buildroot-debug.config b/conf/buildroot-debug.config
index 960b19a..8faab74 100644
--- a/conf/buildroot-debug.config
+++ b/conf/buildroot-debug.config
@@ -28,7 +28,9 @@ BR2_PACKAGE_NFS_UTILS_NFS4=y
28BR2_PACKAGE_GNUTLS=y 28BR2_PACKAGE_GNUTLS=y
29BR2_PACKAGE_OPENLDAP=y 29BR2_PACKAGE_OPENLDAP=y
30BR2_PACKAGE_LIBICONV=y 30BR2_PACKAGE_LIBICONV=y
31BR2_PACKAGE_DHCPCD=y
31BR2_PACKAGE_DROPBEAR=y 32BR2_PACKAGE_DROPBEAR=y
33BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS=y
32BR2_PACKAGE_IPROUTE2=y 34BR2_PACKAGE_IPROUTE2=y
33BR2_PACKAGE_SAMBA4=y 35BR2_PACKAGE_SAMBA4=y
34BR2_TARGET_SYSLINUX=y 36BR2_TARGET_SYSLINUX=y
diff --git a/conf/buildroot-server.config b/conf/buildroot-server.config
index cf85853..9861bb3 100644
--- a/conf/buildroot-server.config
+++ b/conf/buildroot-server.config
@@ -24,7 +24,9 @@ BR2_PACKAGE_NFS_UTILS_NFS4=y
24BR2_PACKAGE_GNUTLS=y 24BR2_PACKAGE_GNUTLS=y
25BR2_PACKAGE_OPENLDAP=y 25BR2_PACKAGE_OPENLDAP=y
26BR2_PACKAGE_LIBICONV=y 26BR2_PACKAGE_LIBICONV=y
27BR2_PACKAGE_DHCPCD=y
27BR2_PACKAGE_DROPBEAR=y 28BR2_PACKAGE_DROPBEAR=y
29BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS=y
28BR2_PACKAGE_IPROUTE2=y 30BR2_PACKAGE_IPROUTE2=y
29BR2_PACKAGE_SAMBA4=y 31BR2_PACKAGE_SAMBA4=y
30BR2_TARGET_SYSLINUX=y 32BR2_TARGET_SYSLINUX=y