sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "debootstrap: avoid duplicate network configuration"

Browse Source
This commit is contained in:
Jenkins 2017-01-31 17:39:28 +00:00 committed by Gerrit Code Review
commit f054e5f24a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
elements/debootstrap/install.d/10-debian-networking
View File

@ -26,7 +26,10 @@ echo $DISTRO_NAME > /etc/hostname
# cloud images expect eth0 and eth1 to use dhcp. # cloud images expect eth0 and eth1 to use dhcp.
mkdir -p /etc/network/interfaces.d mkdir -p /etc/network/interfaces.d
echo "source /etc/network/interfaces.d/*" >> /etc/network/interfaces if ! grep -E -q '^source(|-directory) /etc/network/interfaces.d/\*' /etc/network/interfaces; then
echo "source /etc/network/interfaces.d/*" >> /etc/network/interfaces
echo 'Network configuration set to source /etc/network/interfaces.d/*'
fi
for interface in eth0 eth1; do for interface in eth0 eth1; do
cat << EOF | tee /etc/network/interfaces.d/$interface cat << EOF | tee /etc/network/interfaces.d/$interface
auto $interface auto $interface