5 anos atrás · 2f3dfc53af
--- a/roles/netbootxyz/tasks/generate_checksums.yml
+++ b/roles/netbootxyz/tasks/generate_checksums.yml
@@ -31,6 +31,7 @@
 
				     register: index_title
			
 
				     tags:
			
 
				       - skip_ansible_lint
			
 
				+    when: ansible_os_family == "Debian"
			
 
				 
			
 
				   - name: Generate netboot.xyz index template
			
 
				     template:
			
--- a/roles/netbootxyz/tasks/generate_disks_base.yml
+++ b/roles/netbootxyz/tasks/generate_disks_base.yml
@@ -12,6 +12,12 @@
 
				       - "{{ ansible_distribution | lower }}.yml"
			
 
				       - "{{ ansible_os_family | lower }}.yml"
			
 
				 
			
 
				+  - name: Ensure EPEL is enabled
			
 
				+    yum:
			
 
				+      name: epel-release
			
 
				+      state: present
			
 
				+    when: ansible_os_family == "RedHat"
			
 
				+
			
 
				   - name: Set var to bootloader of loop
			
 
				     set_fact:
			
 
				       bootloader_filename: "{{ bootloader_file }}"
			
--- a/roles/netbootxyz/tasks/generate_disks_efi.yml
+++ b/roles/netbootxyz/tasks/generate_disks_efi.yml
@@ -44,7 +44,7 @@
 
				       mformat -i efi_tmp/ipxe.img -m 0xf8 -f 2880
			
 
				       mmd -i efi_tmp/ipxe.img ::efi ::efi/boot
			
 
				       mcopy -i efi_tmp/ipxe.img bin-x86_64-efi/ipxe.efi ::efi/boot/bootx64.efi
			
 
				-      genisoimage -o ipxe-efi.eiso -eltorito-alt-boot -e ipxe.img -no-emul-boot efi_tmp
			
 
				+      genisoimage -o ipxe-efi.eiso -eltorito-alt-boot -eltorito-boot ipxe.img -no-emul-boot efi_tmp
			
 
				     args:
			
 
				       chdir: "{{ ipxe_source_dir }}/src"
			
 
				       warn: false
			
--- a/roles/netbootxyz/tasks/main.yml
+++ b/roles/netbootxyz/tasks/main.yml
@@ -7,10 +7,6 @@
 
				     when:
			
 
				     - custom_generate_menus | default(false) | bool
			
 
				 
			
 
				-  - include: generate_signatures.yml
			
 
				-    when:
			
 
				-    - generate_signatures | default(false) | bool
			
 
				-
			
 
				   - include: generate_disks.yml
			
 
				     with_items:
			
 
				     - "{{ bootloader_disks }}"
			
@@ -23,3 +19,6 @@
 
				     when:
			
 
				     - generate_checksums | default(true) | bool
			
 
				 
			
 
				+  - include: generate_signatures.yml
			
 
				+    when:
			
 
				+    - generate_signatures | default(false) | bool
			
--- a/roles/netbootxyz/templates/index.html.j2
+++ b/roles/netbootxyz/templates/index.html.j2
@@ -9,6 +9,7 @@ chain --autofree https://{{ boot_domain }}/menu.ipxe || echo HTTPS failed... att
 
				 set conn_type http
			
 
				 chain --autofree http://{{ boot_domain }}/menu.ipxe || echo HTTP failed, localbooting...
			
 
				 {% endif %}
			
 
				+exit
			
 
				 
			
 
				 <!DOCTYPE html>
			
 
				 <html lang="en">
			
@@ -23,7 +24,11 @@ chain --autofree http://{{ boot_domain }}/menu.ipxe || echo HTTP failed, localbo
 
				   </style>
			
 
				   <body>
			
 
				   <div style="font-family: monospace, fixed; font-weight: bold;">
			
 
				+  {% if index_title is defined %}
			
 
				   {{ index_title.stdout }}
			
 
				+  {% else %}
			
 
				+  <h1>{{ site_name }}</h1>
			
 
				+  {% endif %}
			
 
				   <p>
			
 
				   Version: {{ boot_version }}<br>
			
 
				   Powered by <a href=https://netboot.xyz>netboot.xyz</a>
			
--- a/roles/netbootxyz/templates/menu/about.ipxe.j2
+++ b/roles/netbootxyz/templates/menu/about.ipxe.j2
@@ -16,8 +16,6 @@ set fg_cya ${esc:string}[36m
 
				 set fg_whi ${esc:string}[37m
			
 
				 
			
 
				 :netabout
			
 
				-echo Attempting to retrieve latest upstream version...
			
 
				-chain https://boot.netboot.xyz/version.ipxe ||
			
 
				 menu ${fg_cya}${bold}About netboot.xyz (Version: {{ boot_version }})
			
 
				 item exit ${bold}Exit back to main menu...${boldoff}
			
 
				 item --gap --  --------------------------------------------------------------------------
			
--- a/roles/netbootxyz/templates/menu/menu.ipxe.j2
+++ b/roles/netbootxyz/templates/menu/menu.ipxe.j2
@@ -2,6 +2,8 @@
 
				 
			
 
				 :start
			
 
				 chain --autofree boot.cfg ||
			
 
				+echo Attempting to retrieve latest upstream version number...
			
 
				+chain 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"
			
--- a/roles/netbootxyz/vars/redhat.yml
+++ b/roles/netbootxyz/vars/redhat.yml
@@ -8,5 +8,4 @@ netbootxyz_packages:
 
				   - httpd
			
 
				   - minizip-devel
			
 
				   - syslinux
			
 
				-  - toilet
			
 
				   - xz-devel
			
--- a/script/message
+++ b/script/message
@@ -8,7 +8,7 @@ if [ "${TYPE}" == "dev-push" ]; then
 
				 elif [ "${TYPE}" == "rc-push" ]; then
			
 
				   BOOT_URL="https://staging.boot.netboot.xyz/$(cat version.txt)-RC/index.html"
			
 
				 elif [ "${TYPE}" == "live-push" ]; then
			
 
				-  BOOT_URL="https://staging.boot.netboot.xyz/$(cat version.txt)/index.html"
			
 
				+  BOOT_URL="https://boot.netboot.xyz/$(cat version.txt)/index.html"
			
 
				 fi
			
 
				 
			
 
				 
			
--- a/script/netbootxyz-overrides.yml
+++ b/script/netbootxyz-overrides.yml
@@ -3,6 +3,7 @@ sigs_menu: true
 
				 sigs_enabled: true
			
 
				 img_sigs_enabled: false
			
 
				 generate_disks_arm: true
			
 
				+generate_version_file: true
			
 
				 bootloader_multiple: true
			
 
				 bootloader_disks:
			
 
				   - "netboot.xyz"
			
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
 
				-2.0.0
			
 
				+2.0.1
@@ -1 +1 @@
 				-2.0.0
 				+2.0.1