Merge pull request #449 from netbootxyz/development

Promote 2.0 to RC

CONTRIBUTING.md

@@ -44,9 +44,19 @@ especially when you may have limited bandwidth.
 
 ### Submit ideas
 
-I'm always looking for new ideas to make the tool more useful, if you have an
+We are always looking for new ideas to make the tool more useful, if you have an
 idea, feel free to open up a Github [issue] or open up a [Pull Request].
 
+### Communication Channels
+
+* [Discord](https://discord.gg/An6PA2a) Chat Server for netboot.xyz discussions, questions, and development
+* Follow us on [Twitter](https://twitter.com/netbootxyz) at [@netbootxyz](https://twitter.com/netbootxyz)
+  for the latest updates
+
+### Donate
+
+We have set up an [Open Collective](https://opencollective.com/netbootxyz) to open the project up to those who wish to donate to help out the project. This may cover hosting and domain fees, hardware for validation testing, or anything else that comes up in maintaining a project like this. Every little bit will help! If you enjoy the work we do, please support us!
+
 ## Enjoy and have fun!
 
 [issue]: https://github.com/netbootxyz/netboot.xyz/issues/new

README.md

@@ -50,18 +50,19 @@ This will load the appropriate netboot.xyz kernel with all of the proper options
 See [netboot.xyz](https://netboot.xyz) for all documentation.  Some links to get started with are:
 
 * [Downloads](https://netboot.xyz/downloads/)
+* [Self Hosting](https://netboot.xyz/selfhosting/)
 * [Booting Methods](https://netboot.xyz/booting/)
 * [FAQ](https://netboot.xyz/faq/)
 
-If you'd like to contribute to the documentation, the netboot.xyz documenation is located at [netboot.xyz-docs](https://github.com/netbootxyz/netboot.xyz-docs).
+If you'd like to contribute to the documentation, the netboot.xyz documentation is located at [netboot.xyz-docs](https://github.com/netbootxyz/netboot.xyz-docs).
 
 ### Self Hosting netboot.xyz
 
-For those users who want to deploy their own netboot.xyz environment, you can leverage
-the same scripts that are used to deploy the hosted environment. The source scripts are
-all ansible templates and can be generated and customized to your preference.
+For those users who want to deploy their own netboot.xyz environment,  you can leverage the same scripts that are used to deploy the hosted environment. The source scripts are all Ansible templates and can be generated and customized to your preference.
 
-#### With Ansible
+Please see the [self-hosting docs](https://netboot.xyz/selfhosting/) for more information but in short:
+
+#### Deploying using Ansible
 
 To generate, run:
 
@@ -71,7 +72,7 @@ ansible-playbook -i inventory site.yml
 
 The build output will be located in /var/www/html by default.
 
-#### With Docker
+#### Deploying with Docker
 
 ```
 docker build -t localbuild -f Dockerfile-build .
@@ -80,13 +81,11 @@ docker run --rm -it -v $(pwd):/buildout localbuild
 
 The build output will be in the generated folder `buildout`
 
-#### Local Overides
-
-Ansible will handle source generation as well as ipxe disk generation with your settings.  The disk generation was worked on a while back so it needs work to catch it up to the existing state of netboot.xyz.
+#### Local Overrides
 
-If you want to override the defaults, you can put overrides in user_overrides.yml.  See file for examples.
+Ansible will handle source generation as well as iPXE disk generation with your settings.  It will generate Legacy (PCBIOS) and UEFI iPXE disks that can be used to load into your netboot.xyz environment. If you want to override the defaults, you can put overrides in user_overrides.yml.  See `user_overrides.yml` for examples. 
 
-Also note many user customizations are located in the boot.cfg file for the IPXE menus. A high level of customization can be achieved using our stock build output and hosting this along with the menus locally. 
+Using the overrides file, you can override all of the settings from the defaults/main.yml so that you can easily change the boot mirror URLs when the menus are rendered.  If you prefer to do this after the fact, you can also edit the boot.cfg to make changes, but keep in mind those changes will not be saved when you redeploy the menu.
 
 #### Self Hosted Custom Options
 

endpoints.yml

@@ -554,7 +554,7 @@ endpoints:
     flavor: user
     kernel: kde-neon-user
   regolith-current:
-    path: /ubuntu-squash/releases/download/1.2-e759dca4/
+    path: /ubuntu-squash/releases/download/1.2-f910f94d/
     files:
     - initrd
     - vmlinuz

roles/netbootxyz/defaults/main.yml

@@ -78,8 +78,8 @@ releases:
     enabled: true
     menu: "linux"
     versions:
-      - name: "3.10"
-        code_name: "v3.10"
+      - name: "3.11"
+        code_name: "v3.11"
       - name: "Edge (development)"
         code_name: "edge"
   archlinux:

roles/netbootxyz/files/ipxe/local/console.h

@@ -0,0 +1 @@
+#define	CONSOLE_FRAMEBUFFER	/* Graphical framebuffer console */

roles/netbootxyz/files/ipxe/local/general.h

@@ -1,3 +1,4 @@
+#define CONSOLE_CMD		      /* Console command */
 #define DIGEST_CMD            /* Image crypto digest commands */
 #define DOWNLOAD_PROTO_HTTPS  /* Secure Hypertext Transfer Protocol */      
 #define IMAGE_COMBOOT         /* COMBOOT */

roles/netbootxyz/files/ipxe/local/general.h.efi

@@ -1,3 +1,4 @@
+#define CONSOLE_CMD		      /* Console command */
 #define DIGEST_CMD            /* Image crypto digest commands */
 #define DOWNLOAD_PROTO_HTTPS  /* Secure Hypertext Transfer Protocol */      
 #define IMAGE_TRUST_CMD	      /* Image trust management commands */

roles/netbootxyz/tasks/generate_disks_arm.yml

@@ -6,6 +6,7 @@
         dest: "{{ ipxe_source_dir }}/src/config/local/{{ item }}"
       with_items:
         - colour.h
+        - console.h
         - crypto.h
 
     - name: Copy netboot.xyz general.h.efi iPXE config

roles/netbootxyz/tasks/generate_disks_base.yml

@@ -56,7 +56,6 @@
       path: "{{ ipxe_source_dir }}/{{ item }}"
       state: touch
     with_items:
-      - src/config/local/console.h
       - src/config/local/umalloc.h
       - src/config/local/nap.h
       - src/config/local/timer.h

roles/netbootxyz/tasks/generate_disks_efi.yml

@@ -6,6 +6,7 @@
       dest: "{{ ipxe_source_dir }}/src/config/local/{{ item }}"
     with_items:
       - colour.h
+      - console.h
       - crypto.h
 
   - name: Copy netboot.xyz general.h.efi iPXE config

roles/netbootxyz/tasks/generate_disks_legacy.yml

@@ -6,6 +6,7 @@
       dest: "{{ ipxe_source_dir }}/src/config/local/{{ item }}"
     with_items:
       - colour.h
+      - console.h
       - crypto.h
       - general.h
 

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

script/build_release

@@ -45,7 +45,9 @@ rm -Rf ipxe
 tar -czf menus.tar.gz *
 mv menus.tar.gz ../githubout
 cd ..
-
+if [[ "${TYPE}" == "dev" ]]; then
+  cp githubout/menus.tar.gz s3out/
+fi
 
 # Latest style endpoints for RC and Live
 if [[ "${TYPE}" == "release" ]] || [[ "${TYPE}" == "rc" ]]; then

script/netbootxyz-overrides.yml

@@ -8,7 +8,6 @@ bootloader_disks:
   - "netboot.xyz"
   - "netboot.xyz-packet"
 generate_signatures: true
-generate_disks_arm: true
 sigs_dir: "{{ netbootxyz_root }}/sigs"
 sigs_location: "http://${boot_domain}/sigs/"
 cert_dir: "/ansible/certs"

version.txt

@@ -1 +1 @@
-1.9.91
+2.0.0