openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Fix dhcp-all-interfaces on debuntu systems"

This commit is contained in:
Zuul 2022-04-28 00:05:10 +00:00 committed by Gerrit Code Review
parent 638a94d8c9 7b41f8160b
commit 737c9a8ff3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diskimage_builder/elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.sh
View File

@ -79,7 +79,7 @@ function enable_interface() {
printf "auto $interface\niface $interface inet dhcp\n\n" >>$ENI_FILE
if [ "$ipv6_init" == "True" ]; then
# Make DUID-UUID Type 4 (RFC 6355)
echo "default-duid \"\\x00\\x04$(sed 's/.\{2\}/\\x&/g' < /etc/machine-id)\";" >"/var/lib/dhclient/dhclient6--$interface.lease"
echo "default-duid \"\\x00\\x04$(sed 's/.\{2\}/\\x&/g' < /etc/machine-id)\";" >"/var/lib/dhcp/dhclient6--$interface.lease"
if [ $ipv6_AdvManagedFlag == "Yes" ]; then
# IPv6 DHCPv6 Stateful address configuration
printf "iface $interface inet6 dhcp\n\n" >>$ENI_FILE
@ -90,7 +90,7 @@ function enable_interface() {
echo "DHCPv6 Stateless Configured."
else
# IPv6 Autoconfiguration (SLAAC)
printf "iface $interface inet6 auto\tdhcp 0\n\n" >>$ENI_FILE
printf "iface $interface inet6 auto\n\tdhcp 0\n\n" >>$ENI_FILE
echo "IPv6 SLAAC Configured"
fi
fi