Merge pull request #61 from stbenjam/ipxe-efi

Bug 1810078: Copy iPXE binaries directly to /shared at runtime

Dockerfile.ocp

@@ -22,9 +22,6 @@ RUN yum update -y && \
     yum clean all && \
     rm -rf /var/cache/{yum,dnf}/*
 
-COPY ./prepare-ipxe.sh /tmp
-RUN chmod +x /tmp/prepare-ipxe.sh && /tmp/prepare-ipxe.sh && rm /tmp/prepare-ipxe.sh
-
 COPY --from=builder /tmp/esp.img /httpboot/uefi_esp.img
 
 COPY ./ironic.conf /tmp/ironic.conf

rundnsmasq.sh

@@ -19,7 +19,15 @@ mkdir -p /shared/html/pxelinux.cfg
 mkdir -p /shared/log/dnsmasq
 
 # Copy files to shared mount
-cp /usr/share/ipxe/undionly.kpxe /usr/share/ipxe/ipxe.efi /shared/tftpboot
+cp /usr/share/ipxe/undionly.kpxe /shared/tftpboot
+if [ -f "/usr/share/ipxe/ipxe.efi" ]; then
+    cp /usr/share/ipxe/ipxe.efi /shared/tftpboot/ipxe.efi
+elif [ -f "/usr/share/ipxe/ipxe-x86_64.efi" ]; then
+    cp  /usr/share/ipxe/ipxe-x86_64.efi /shared/tftpboot/ipxe.efi
+else
+    echo "Fatal Error - Failed to find ipxe binary"
+    exit 1
+fi
 
 # Use configured values
 sed -i -e s/IRONIC_IP/${PROVISIONING_IP}/g -e s/HTTP_PORT/${HTTP_PORT}/g \