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

Merge "Fix for rhel7 iso image creation."

Browse Source
This commit is contained in:
Zuul 2018-03-08 07:05:37 +00:00 committed by Gerrit Code Review
commit d2133ec5e7
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/iso/cleanup.d/100-build-iso
View File

@ -29,7 +29,7 @@ function build_efiboot_img() {
# Ubuntu: grub-efi-amd64-signed and shim-signed # Ubuntu: grub-efi-amd64-signed and shim-signed
# Fedora: grub2-efi and shim # Fedora: grub2-efi and shim
if [ $DISTRO_NAME = "fedora" ]; then if [[ $DISTRO_NAME = "fedora" || $DISTRO_NAME = "rhel7" ]] ; then
cp $TMP_BOOTLOADER_DIR/shim.efi $TMP_BUILD_DIR/bootx64.efi cp $TMP_BOOTLOADER_DIR/shim.efi $TMP_BUILD_DIR/bootx64.efi
cp $TMP_BOOTLOADER_DIR/grubx64.efi $TMP_BUILD_DIR/grubx64.efi cp $TMP_BOOTLOADER_DIR/grubx64.efi $TMP_BUILD_DIR/grubx64.efi
else else

2
diskimage_builder/elements/iso/pkg-map
View File

@ -13,7 +13,7 @@
"isolinux": "" "isolinux": ""
}, },
"redhat":{ "redhat":{
"syslinux": "", "syslinux": "syslinux",
"syslinux-common": "", "syslinux-common": "",
"isolinux": "" "isolinux": ""
} }

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

@ -10,28 +10,28 @@ set -o pipefail
TMP_BOOTLOADER_DIR=/tmp/bootloader_files TMP_BOOTLOADER_DIR=/tmp/bootloader_files
mkdir -p $TMP_BOOTLOADER_DIR mkdir -p $TMP_BOOTLOADER_DIR
if [ $DISTRO_NAME = "fedora" ]; then
GRUB_FILE="/boot/efi/EFI/fedora/grubx64.efi"
else
GRUB_FILE="/usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed"
fi
if [ $DISTRO_NAME = "fedora" ]; then
SHIM_FILE="/boot/efi/EFI/fedora/shim.efi"
else
SHIM_FILE="/usr/lib/shim/shim.efi.signed"
fi
#fedora #fedora
if [ $DISTRO_NAME = "fedora" ]; then if [ $DISTRO_NAME = "fedora" ]; then
GRUB_FILE="/boot/efi/EFI/fedora/grubx64.efi"
SHIM_FILE="/boot/efi/EFI/fedora/shim.efi"
SYSLINUX_FILE="/usr/share/syslinux/isolinux.bin" SYSLINUX_FILE="/usr/share/syslinux/isolinux.bin"
LDLINUX_FILE="/usr/share/syslinux/ldlinux.c32" LDLINUX_FILE="/usr/share/syslinux/ldlinux.c32"
#debian #debian
elif [ $DISTRO_NAME = "debian" ]; then elif [ $DISTRO_NAME = "debian" ]; then
GRUB_FILE="/usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed"
SHIM_FILE="/usr/lib/shim/shim.efi.signed"
SYSLINUX_FILE="/usr/lib/ISOLINUX/isolinux.bin" SYSLINUX_FILE="/usr/lib/ISOLINUX/isolinux.bin"
LDLINUX_FILE="/usr/lib/syslinux/modules/bios/ldlinux.c32" LDLINUX_FILE="/usr/lib/syslinux/modules/bios/ldlinux.c32"
#rhel7
elif [ $DISTRO_NAME = "rhel7" ]; then
GRUB_FILE="/boot/efi/EFI/redhat/grubx64.efi"
SHIM_FILE="/boot/efi/EFI/redhat/shim.efi"
SYSLINUX_FILE="/usr/share/syslinux/isolinux.bin"
LDLINUX_FILE="/usr/share/syslinux/ldlinux.c32"
#ubuntu #ubuntu
else else
GRUB_FILE="/usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed"
SHIM_FILE="/usr/lib/shim/shim.efi.signed"
SYSLINUX_FILE="/usr/lib/syslinux/isolinux.bin" SYSLINUX_FILE="/usr/lib/syslinux/isolinux.bin"
LDLINUX_FILE="/usr/lib/syslinux/ldlinux.c32" LDLINUX_FILE="/usr/lib/syslinux/ldlinux.c32"
fi fi