فهرست منبع

Merge pull request #384 from antonym/packet_efi

Generate packet x86_64 efi disk
Antony Messerli 5 سال پیش
والد
کامیت
8566a96352
3فایلهای تغییر یافته به همراه8 افزوده شده و 3 حذف شده
  1. 1 1
      ipxe/disks/netboot.xyz-packet
  2. 6 1
      script/prep-release.sh
  3. 1 1
      src/boot.cfg

+ 1 - 1
ipxe/disks/netboot.xyz-packet

@@ -12,7 +12,7 @@ set version 1.04
 set ipxe_cloud_config packet
 
 :start
-echo ${bold}${fg_gre}netboot.xyz ${fg_whi}v${version} for ${fg_red}packet.net${fg_whi}${boldoff}
+echo ${bold}${fg_gre}netboot.xyz ${fg_whi}v${version} for ${fg_red}packet.com${fg_whi}${boldoff}
 prompt --key m --timeout 4000 Hit the ${bold}m${boldoff} key to open failsafe menu... && goto failsafe || goto dhcp
 
 :dhcp

+ 6 - 1
script/prep-release.sh

@@ -38,7 +38,7 @@ cp -f bin/ipxe.usb disk.raw
 tar Sczvf netboot.xyz-gce.tar.gz disk.raw
 mv netboot.xyz-gce.tar.gz ../../build/ipxe/netboot.xyz-gce.tar.gz
 
-# generate netboot.xyz-packet iPXE disk
+# generate netboot.xyz-packet legacy iPXE disk
 make bin/undionly.kpxe \
 EMBED=../../ipxe/disks/netboot.xyz-packet TRUST=ca-ipxe-org.crt,ca-netboot-xyz.crt
 mv bin/undionly.kpxe ../../build/ipxe/netboot.xyz-packet.kpxe
@@ -57,6 +57,11 @@ genisoimage -o ipxe.eiso -eltorito-alt-boot -e ipxe.img -no-emul-boot efi_tmp
 mv bin-x86_64-efi/ipxe.efi ../../build/ipxe/netboot.xyz.efi
 mv ipxe.eiso ../../build/ipxe/netboot.xyz-efi.iso
 
+# generate netboot.xyz-packet efi iPXE disk
+make bin-x86_64-efi/ipxe.efi \
+EMBED=../../ipxe/disks/netboot.xyz-packet TRUST=ca-ipxe-org.crt,ca-netboot-xyz.crt
+mv bin-x86_64-efi/ipxe.efi ../../build/ipxe/netboot.xyz-packet.efi
+
 # iPXE workaround
 # http://lists.ipxe.org/pipermail/ipxe-devel/2018-August/006254.html
 # apply patch to fix arm64 builds on amd64 builds

+ 1 - 1
src/boot.cfg

@@ -117,7 +117,7 @@ goto clouds_end
 
 :packet_x86_64
 set console console=ttyS1,115200n8
-set ipxe_disk netboot.xyz-packet.kpxe
+iseq ${platform} efi && set ipxe_disk netboot.xyz-packet.efi || set ipxe_disk netboot.xyz-packet.kpxe
 set menu_freedos 0
 set menu_windows 0
 set menu_utils 0