starlingx/metal
Code Issues Proposed changes

Merge "Remove dhclient request during pxeboot"

Browse Source
This commit is contained in:
Zuul 2024-11-27 15:19:11 +00:00 committed by Gerrit Code Review
commit 920da5b194
1 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
kickstart/files/kickstart.cfg
View File

@ -2907,40 +2907,6 @@ iface vlan${mgmt_vlan} ${boot_address_family} static
post-up echo 0 > /proc/sys/net/ipv6/conf/vlan${mgmt_vlan}/autoconf; echo 0 > /proc/sys/net/ipv6/conf/vlan${mgmt_vlan}/accept_ra; echo 0 > /proc/sys/net/ipv6/conf/vlan${mgmt_vlan}/accept_redirects
EOF
# Reject DHCPOFFER from DHCP server that doesn't send
# wrs-install-uuid option
echo "require wrs-install-uuid;" >>/etc/dhcp/dhclient.conf
echo "require dhcp6.wrs-install-uuid;" >>/etc/dhcp/dhclient.conf
# set the same DUID-LL IDs (see RFC 8415) that will be used during regular operations
echo "send dhcp6.client-id = concat(00:03:00, hardware);" >>/etc/dhcp/dhclient.conf
echo "send dhcp-client-identifier = concat(00:03:00, hardware);" >>/etc/dhcp/dhclient.conf
# Bring up the boot vlan so that a dhcp lease is acquired and an address is
# setup prior to the post-install reboot. This is so that the timing of the IP
# address allocation is similar to how normal/non-pxe installation works.
boot_iface=vlan${mgmt_vlan}
ilog "boot_iface=vlan${mgmt_vlan}"
ilog "boot_address_family: ${boot_address_family}"
dhclient_family=$([[ ${boot_address_family} == "inet" ]] && echo -4 || echo -6)
ilog "dhclient_family: ${dhclient_family}"
ilog "ip link add link ${boot_dev} name ${boot_iface} type vlan id ${mgmt_vlan}"
ip link add link ${boot_dev} name ${boot_iface} type vlan id ${mgmt_vlan}
ilog "ip link set up dev ${boot_iface}"
ip link set up dev ${boot_iface}
timeout_value=60
dhclient_request="/usr/sbin/dhclient $dhclient_family $boot_iface"
ilog "timeout ${timeout_value} ${dhclient_request}"
timeout ${timeout_value} ${dhclient_request}
rc=${?}
if [ ${rc} -ne 0 ] ; then
wlog "timeout ${timeout_value} ${dhclient_request} failed ; rc:${rc}"
else
ilog "${dhclient_request} complete"
fi
fi
# Clean machine-id file, it needs to be generated after install.