Merge "Move Ubuntu specific use_tempaddr setting to ubuntu-common element"

This commit is contained in:
Jenkins 2017-02-07 23:25:38 +00:00 committed by Gerrit Code Review
commit 24628b135b
5 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,5 @@
ubuntu-common
=============
This element holds configuration and scripts that are common for all
Ubuntu images.

View File

@ -21,7 +21,17 @@ if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
fi fi
set -e set -e
# This will disable the disable Privacy extensions for IPv6 (RFC3041) # This will disable the privacy extensions for IPv6 (RFC4941)
# (RFC4941 obsoletes RFC3041)
#
# Note that depending on the implementation of how the sysctl
# settings are applied there is a race condition: there might be
# a small time-frame where the original Ubuntu settings from
# /etc/sysctl.d/10-ipv6-privacy.conf are already applied but the
# new settings from /etc/sysctl.d/99-cloudimg-ipv6.conf
# not yet.
# If during this time all started network interfaces will
# use the privacy extension.
cat > /etc/sysctl.d/99-cloudimg-ipv6.conf <<EOF cat > /etc/sysctl.d/99-cloudimg-ipv6.conf <<EOF
# See https://bugs.launchpad.net/ubuntu/+source/procps/+bug/1068756 # See https://bugs.launchpad.net/ubuntu/+source/procps/+bug/1068756
net.ipv6.conf.all.use_tempaddr=0 net.ipv6.conf.all.use_tempaddr=0

View File

@ -1,3 +1,4 @@
cache-url cache-url
dib-run-parts dib-run-parts
dpkg dpkg
ubuntu-common

View File

@ -1,2 +1,3 @@
debootstrap debootstrap
package-installs package-installs
ubuntu-common

View File

@ -3,3 +3,4 @@ cloud-init-datasources
dib-run-parts dib-run-parts
dkms dkms
dpkg dpkg
ubuntu-common