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

Package ldlinux.c32 along with isolinux.bin if it exists

Browse Source 
Starting from syslinux 5.00, isolinux.bin is dependent on
ldlinux.c32 to boot for BIOS machine.  syslinux > 5.00 is
delivered with Fedora 21 cloud image which breaks the boot
from ISO if ldlinux.c32 doesn't exist.

Change-Id: If722f36aeaabc759d93ef6ae3f49b21bb840a92d
Closes-Bug: 1449882
This commit is contained in:
Ramakrishnan G 2015-04-29 07:21:03 +00:00
parent 703313fb18
commit 91e9e0aef8
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
elements/iso/cleanup.d/100-build-iso
View File

@ -83,9 +83,17 @@ function build_iso() {
echo "Copying isolinux.bin" echo "Copying isolinux.bin"
ISOLINUX_BIN=$TMP_BOOTLOADER_DIR/isolinux.bin ISOLINUX_BIN=$TMP_BOOTLOADER_DIR/isolinux.bin
LDLINUX_BIN=$TMP_BOOTLOADER_DIR/ldlinux.c32
cp $ISOLINUX_BIN "$TMP_IMAGE_DIR/isolinux" cp $ISOLINUX_BIN "$TMP_IMAGE_DIR/isolinux"
# Starting from SYSLINUX 5.00, the isolinux.bin is dependent
# on ldlinux.c32.
# http://www.syslinux.org/wiki/index.php/Library_modules
if [ -f "$LDLINUX_BIN" ]; then
cp $LDLINUX_BIN "$TMP_IMAGE_DIR/isolinux"
fi
# Copy initrd, kernel # Copy initrd, kernel
echo "Copying kernel to $TMP_IMAGE_DIR/vmlinuz" echo "Copying kernel to $TMP_IMAGE_DIR/vmlinuz"
cp $KERNEL "$TMP_IMAGE_DIR/vmlinuz" cp $KERNEL "$TMP_IMAGE_DIR/vmlinuz"

9
elements/iso/post-install.d/01-copy-bootloaders
View File

@ -24,10 +24,19 @@ fi
if [ $DISTRO_NAME = "fedora" ]; then if [ $DISTRO_NAME = "fedora" ]; then
SYSLINUX_FILE="/usr/share/syslinux/isolinux.bin" SYSLINUX_FILE="/usr/share/syslinux/isolinux.bin"
LDLINUX_FILE="/usr/share/syslinux/ldlinux.c32"
else else
SYSLINUX_FILE="/usr/lib/syslinux/isolinux.bin" SYSLINUX_FILE="/usr/lib/syslinux/isolinux.bin"
LDLINUX_FILE="/usr/lib/syslinux/ldlinux.c32"
fi fi
cp $GRUB_FILE $TMP_BOOTLOADER_DIR cp $GRUB_FILE $TMP_BOOTLOADER_DIR
cp $SHIM_FILE $TMP_BOOTLOADER_DIR cp $SHIM_FILE $TMP_BOOTLOADER_DIR
cp $SYSLINUX_FILE $TMP_BOOTLOADER_DIR cp $SYSLINUX_FILE $TMP_BOOTLOADER_DIR
# Starting from SYSLINUX 5.00, the isolinux.bin is dependent
# on ldlinux.c32.
# http://www.syslinux.org/wiki/index.php/Library_modules
if [ -f "$LDLINUX_FILE" ]; then
cp $LDLINUX_FILE $TMP_BOOTLOADER_DIR
fi