openstack/diskimage-builder
Code Issues Proposed changes

Merge "Fallback to a boot_server kernel param if ip= not passed"

Browse Source
This commit is contained in:
Jenkins 2015-01-21 08:56:55 +00:00 committed by Gerrit Code Review
commit 241b3155c0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
elements/ramdisk-base/init.d/20-init-variables
View File

@ -18,7 +18,14 @@ readonly _BOOTIF_=$(get_kernel_parameter BOOTIF)
readonly _IP_=$(get_kernel_parameter ip) readonly _IP_=$(get_kernel_parameter ip)
readonly BOOT_MAC_ADDRESS=$(echo "$_BOOTIF_" | sed -e "s/-/:/g" | \ readonly BOOT_MAC_ADDRESS=$(echo "$_BOOTIF_" | sed -e "s/-/:/g" | \
sed -e "s/^01://g" | tr 'a-f' 'A-F') sed -e "s/^01://g" | tr 'a-f' 'A-F')
# If bootloader did not pass on network info, we fallback to a kernel
# parameter to locate the address of the boot server.
if [ -n "$_IP_" ]; then
readonly BOOT_SERVER=$(echo "$_IP_" | cut -d':' -f2) readonly BOOT_SERVER=$(echo "$_IP_" | cut -d':' -f2)
else
readonly BOOT_SERVER=$(get_kernel_parameter boot_server)
fi
# IP address, netmask, gateway can be set a later point of time if # IP address, netmask, gateway can be set a later point of time if
# IP address is assigned by dhcp (for non-pxe boots). # IP address is assigned by dhcp (for non-pxe boots).