openstack/devstack
Code Issues Proposed changes

Merge "Fix Ironic for Syslinux >= 5.00"

Browse Source
This commit is contained in:
Jenkins 2015-02-27 20:36:25 +00:00 committed by Gerrit Code Review
commit b554c39dc6
1 changed files with 9 additions and 1 deletions

10
lib/ironic

@ -238,7 +238,15 @@ function configure_ironic_dirs {
die $LINENO "PXE boot file $IRONIC_PXE_BOOT_IMAGE not found." die $LINENO "PXE boot file $IRONIC_PXE_BOOT_IMAGE not found."
fi fi
cp $IRONIC_PXE_BOOT_IMAGE $IRONIC_TFTPBOOT_DIR # Copy PXE binary
if [[ "$IRONIC_IPXE_ENABLED" == "True" ]] ; then
cp $IRONIC_PXE_BOOT_IMAGE $IRONIC_TFTPBOOT_DIR
else
# Syslinux >= 5.00 pxelinux.0 binary is not "stand-alone" anymore,
# it depends on some c32 modules to work correctly.
# More info: http://www.syslinux.org/wiki/index.php/Library_modules
cp -aR $(dirname $IRONIC_PXE_BOOT_IMAGE)/*.{c32,0} $IRONIC_TFTPBOOT_DIR
fi
} }
# configure_ironic() - Set config files, create data dirs, etc # configure_ironic() - Set config files, create data dirs, etc