Merge pull request #442 from netbootxyz/alpine_bump

Switch to lts kernel and merge edge and regular together

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

@@ -24,33 +24,22 @@ set base-url ${alpinelinux_mirror}
 set dir ${alpinelinux_base_dir}/${alpine_version}/releases/${bootarch}/netboot
 set repo-url ${alpinelinux_mirror}/${alpinelinux_base_dir}/${alpine_version}/main
 imgfree
-iseq ${alpine_version} edge && goto edge_boot ||
-kernel ${base-url}/${dir}/vmlinuz-vanilla ${ipparam} alpine_repo=${repo-url} modules=loop,squashfs modloop=${base-url}/${dir}/modloop-vanilla quiet nomodeset
-initrd ${base-url}/${dir}/initramfs-vanilla
+kernel ${base-url}/${dir}/vmlinuz-lts ${ipparam} alpine_repo=${repo-url} modules=loop,squashfs modloop=${base-url}/${dir}/modloop-lts quiet nomodeset
+initrd ${base-url}/${dir}/initramfs-lts
 echo
 echo MD5sums:
-md5sum vmlinuz-vanilla initramfs-vanilla
+md5sum vmlinuz-lts initramfs-lts
 iseq ${img_sigs_enabled} true && goto verify_sigs || goto skip_sigs
 :verify_sigs
 echo
 echo Checking signatures...
-imgverify vmlinuz-vanilla ${sigs}${dir}/vmlinuz-vanilla.sig || goto error
-imgverify initramfs-vanilla ${sigs}${dir}/initramfs-vanilla.sig || goto error
+imgverify vmlinuz-lts ${sigs}${dir}/vmlinuz-lts.sig || goto error
+imgverify initramfs-lts ${sigs}${dir}/initramfs-lts.sig || goto error
 echo Signatures verified!
 echo
 :skip_sigs
 boot
 
-:edge_boot
-kernel ${base-url}/${dir}/vmlinuz-lts ${ipparam} alpine_repo=${repo-url} modules=loop,squashfs modloop=${base-url}/${dir}/modloop-lts quiet nomodeset
-initrd ${base-url}/${dir}/initramfs-lts
-echo
-echo MD5sums:
-md5sum vmlinuz-lts initramfs-lts
-boot
-
-goto alpine_exit
-
 :alpine_exit
 clear menu
 exit 0