Merge pull request #466 from netbootxyz/development

Release 2.0.2-RC

roles/netbootxyz/templates/menu/boot.cfg.j2

@@ -25,6 +25,13 @@ set sigs {{ sigs_location }}
 # set location of latest iPXE
 iseq ${platform} efi && set ipxe_disk netboot.xyz-snponly.efi || set ipxe_disk netboot.xyz-undionly.kpxe
 
+######################################
+# Media Locations for Licensed Distros
+######################################
+
+set rhel_base_url {{ rhel_base_url | default("") }}
+set win_base_url {{ win_base_url | default("") }}
+
 ##################
 # official mirrors
 ##################

roles/netbootxyz/templates/menu/live-deepin.ipxe

@@ -14,7 +14,7 @@ goto ${live_version}
 :15
 set squash_url ${live_endpoint}{{ endpoints["deepin-15-squash"].path }}filesystem.squashfs
 set kernel_url ${live_endpoint}{{ endpoints["deepin-15-squash"].path }}
-goto live-boot
+goto 15-boot
 
 :15-boot
 imgfree

roles/netbootxyz/templates/menu/live-elementary.ipxe.j2

@@ -27,7 +27,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper maybe-ubiquity netboot=http fetch=${squash_url} initrd=initrd
 initrd ${kernel_url}initrd
 boot
 

roles/netbootxyz/templates/menu/menu.ipxe.j2

@@ -3,7 +3,7 @@
 :start
 chain --autofree boot.cfg ||
 echo Attempting to retrieve latest upstream version number...
-chain https://boot.netboot.xyz/version.ipxe ||
+chain --timeout 5 https://boot.netboot.xyz/version.ipxe ||
 ntp {{ time_server }} ||
 iseq ${cls} serial && goto ignore_cls ||
 set cls:hex 1b:5b:4a  # ANSI clear screen sequence - "^[[J"

roles/netbootxyz/templates/menu/windows.ipxe.j2

@@ -30,6 +30,7 @@ echo -n URL: ${} && read win_base_url
 echo
 echo netboot.xyz will attempt to load the following files:
 echo ${win_base_url}/${win_arch}/bootmgr
+echo ${win_base_url}/${win_arch}/bootmgr.efi
 echo ${win_base_url}/${win_arch}/boot/bcd
 echo ${win_base_url}/${win_arch}/boot/boot.sdi
 echo ${win_base_url}/${win_arch}/sources/boot.wim
@@ -41,19 +42,14 @@ goto windows
 isset ${win_base_url} && goto boot || echo URL not set... && goto url_set
 
 :boot
+imgfree
 kernel {{ wimboot_location }}
-initrd ${win_base_url}/${win_arch}/bootmgr bootmgr
-initrd ${win_base_url}/${win_arch}/boot/bcd bcd
-initrd ${win_base_url}/${win_arch}/boot/boot.sdi boot.sdi
-initrd ${win_base_url}/${win_arch}/sources/boot.wim boot.wim
-md5sum wimboot
-iseq ${img_sigs_enabled} true && goto verify_sigs || goto skip_sigs
-:verify_sigs
-echo
-echo Checking wimboot signature...
-imgverify wimboot ${sigs}wimboot.sig || goto error
-:skip_sigs
+initrd -n bootmgr     ${win_base_url}/${win_arch}/bootmgr       bootmgr ||
+initrd -n bootmgr.efi ${win_base_url}/${win_arch}/bootmgr.efi   bootmgr.efi ||      
+initrd -n bcd         ${win_base_url}/${win_arch}/boot/bcd      bcd
+initrd -n boot.sdi    ${win_base_url}/${win_arch}/boot/boot.sdi boot.sdi   
+initrd -n boot.wim    ${win_base_url}/${win_arch}/boot/boot.wim boot.wim
 boot
 
 :windows_exit
-exit 0
+exit 0

user_overrides.yml

@@ -29,3 +29,7 @@ generate_checksums: true
 #utilities_overrides:
 #  supergrub:
 #    enabled: false
+
+# set licensed media locations in boot.cfg
+# win_base_url:
+# rhel_base_url: 

version.txt

@@ -1 +1 @@
-2.0.1
+2.0.2