Merge pull request #549 from netbootxyz/tinycore

Swapping tinycore over to all of their flavors instead of memdisk

README.md

@@ -143,7 +143,7 @@ In addition to being able to host netboot.xyz locally, you can also create your
 |Slackware|https://www.slackware.com| Yes | No |
 |SparkyLinux|https://sparkylinux.org/| No | Yes |
 |Tails|https://tails.boum.org | No | Yes |
-|Tiny Core Linux|https://tinycorelinux.net| ISO - Memdisk | No |
+|Tiny Core Linux|https://tinycorelinux.net| Yes | Yes |
 |Ubuntu|https://www.ubuntu.com| Yes | Yes |
 |Velt|https://velt.io/| No | Yes |
 |Voyager|https://voyagerlive.org | No | Yes |

roles/netbootxyz/defaults/main.yml

@@ -363,14 +363,110 @@ releases:
         code_name: "14.1"
   tinycore:
     name: "Tiny Core Linux"
-    mirror: "http://tinycorelinux.net"
+    mirror: "http://distro.ibiblio.org/tinycorelinux"
     enabled: true
     menu: "linux"
     versions:
-      - name: "Core [ISO]"
-        code_name: "Core"
-      - name: "TinyCore [ISO]"
-        code_name: "TinyCore"
+      - name: "Core"
+        code_name: "core"
+        arch: "x86"
+        kernel: "/10.x/x86/release/distribution_files/vmlinuz"
+        initrd: "/10.x/x86/release/distribution_files/core.gz"
+      - name: "CorePure"
+        code_name: "corepure"
+        arch: "x86_64"
+        kernel: "/10.x/x86_64/release/distribution_files/vmlinuz64"
+        initrd: "/10.x/x86_64/release/distribution_files/corepure64.gz"
+      - name: "dCore Bionic"
+        code_name: "dcorebionic"
+        arch: "x86"
+        kernel: "/dCore/x86/release/dCore-bionic/vmlinuz-bionic"
+        initrd: "/dCore/x86/release/dCore-bionic/dCore-bionic.gz"
+      - name: "dCore Bionic Plus"
+        code_name: "dcorebionicplus"
+        arch: "x86"
+        kernel: "/dCore/x86/release/dCore-bionic/vmlinuz-bionic"
+        initrd: "/dCore/x86/release/dCore-bionic/dCorePlus-bionic.gz"
+      - name: "dCore Jessie"
+        code_name: "dcorejessie"
+        arch: "x86"
+        kernel: "/dCore/x86/release/dCore-jessie/vmlinuz-jessie"
+        initrd: "/dCore/x86/release/dCore-jessie/dCore-jessie.gz"
+      - name: "dCore Jessie Plus"
+        code_name: "dcorejessieplus"
+        arch: "x86"
+        kernel: "/dCore/x86/release/dCore-jessie/vmlinuz-jessie"
+        initrd: "/dCore/x86/release/dCore-jessie/dCorePlus-jessie.gz"
+      - name: "dCore Stretch"
+        code_name: "dcorestretch"
+        arch: "x86"
+        kernel: "/dCore/x86/release/dCore-stretch/vmlinuz-stretch"
+        initrd: "/dCore/x86/release/dCore-stretch/dCore-stretch.gz"
+      - name: "dCore Stretch Plus"
+        code_name: "dcorestretchplus"
+        arch: "x86"
+        kernel: "/dCore/x86/release/dCore-stretch/vmlinuz-stretch"
+        initrd: "/dCore/x86/release/dCore-stretch/dCorePlus-stretch.gz"
+      - name: "dCore Trusty"
+        code_name: "dcoretrusty"
+        arch: "x86"
+        kernel: "/dCore/x86/release/dCore-trusty/vmlinuz-trusty"
+        initrd: "/dCore/x86/release/dCore-trusty/dCore-trusty.gz"
+      - name: "dCore Trusty Plus"
+        code_name: "dcoretrustyplus"
+        arch: "x86"
+        kernel: "/dCore/x86/release/dCore-trusty/vmlinuz-trusty"
+        initrd: "/dCore/x86/release/dCore-trusty/dCorePlus-trusty.gz"
+      - name: "dCore Wheezy"
+        code_name: "dcorewheezy"
+        arch: "x86"
+        kernel: "/dCore/x86/release/dCore-wheezy/vmlinuz-wheezy"
+        initrd: "/dCore/x86/release/dCore-wheezy/dCore-wheezy.gz"
+      - name: "dCore Wheezy Plus"
+        code_name: "dcorewheezyplus"
+        arch: "x86"
+        kernel: "/dCore/x86/release/dCore-wheezy/vmlinuz-wheezy"
+        initrd: "/dCore/x86/release/dCore-wheezy/dCorePlus-wheezy.gz"
+      - name: "dCore Xenial"
+        code_name: "dcorexenial"
+        arch: "x86"
+        kernel: "/dCore/x86/release/dCore-xenial/vmlinuz-xenial"
+        initrd: "/dCore/x86/release/dCore-xenial/dCore-xenial.gz"
+      - name: "dCore Xenial Plus"
+        code_name: "dcorexenialplus"
+        arch: "x86"
+        kernel: "/dCore/x86/release/dCore-xenial/vmlinuz-xenial"
+        initrd: "/dCore/x86/release/dCore-xenial/dCorePlus-xenial.gz"
+      - name: "dCore64 Bionic"
+        code_name: "dcore64bionic"
+        arch: "x86_64"
+        kernel: "/dCore/x86_64/release/dCore-bionic64/vmlinuz-bionic64"
+        initrd: "/dCore/x86_64/release/dCore-bionic64/dCore-bionic64.gz"
+      - name: "dCore64 Bionic Plus"
+        code_name: "dcore64bionicplus"
+        arch: "x86_64"
+        kernel: "/dCore/x86_64/release/dCore-bionic64/vmlinuz-bionic64"
+        initrd: "/dCore/x86_64/release/dCore-bionic64/dCorePlus-bionic64.gz"
+      - name: "dCore64 Buster"
+        code_name: "dcore64buster"
+        arch: "x86_64"
+        kernel: "/dCore/x86_64/release/dCore-buster64/vmlinuz-buster64"
+        initrd: "/dCore/x86_64/release/dCore-buster64/dCore-buster64.gz"
+      - name: "dCore64 Buster Plus"
+        code_name: "dcore64busterplus"
+        arch: "x86_64"
+        kernel: "/dCore/x86_64/release/dCore-buster64/vmlinuz-buster64"
+        initrd: "/dCore/x86_64/release/dCore-buster64/dCorePlus-buster64.gz"
+      - name: "dCore64 Stretch"
+        code_name: "dcore64stretch"
+        arch: "x86_64"
+        kernel: "/dCore/x86_64/release/dCore-stretch64/vmlinuz-stretch64"
+        initrd: "/dCore/x86_64/release/dCore-stretch64/dCore-stretch64.gz"
+      - name: "dCore Stretch Plus"
+        code_name: "dcore64stretchplus"
+        arch: "x86_64"
+        kernel: "/dCore/x86_64/release/dCore-stretch64/vmlinuz-stretch64"
+        initrd: "/dCore/x86_64/release/dCore-stretch64/dCorePlus-stretch64.gz"
   ubuntu:
     name: "Ubuntu"
     mirror: "http://archive.ubuntu.com"

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

@@ -29,6 +29,7 @@ item live-popos ${space} Pop OS
 item live-regolith ${space} Regolith
 item live-sparky ${space} SparkyLinux
 item live-tails ${space} Tails
+item tinycore ${space} Tiny Core Linux
 item live-ubuntu ${space} Ubuntu
 item live-velt ${space} Velt
 item live-voyager ${space} Voyager

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

@@ -5,18 +5,49 @@
 
 set tinycore_mirror {{ releases.tinycore.mirror }}
 
-:tinycore_menu
-set dir 10.x/x86/release
-menu Tiny Core Linux 10.x
+:arch_menu
+set os Tiny Core Linux
+menu ${os}
+item --gap  Please choose a version below:
+item x86 ${space} ${os} x86 (default)
+item x86_64 ${space} ${os} x86_64
+choose arch || goto tinycore_exit
+goto ${arch} 
+
+:x86
+menu ${os}
+item --gap  Please choose a version below:
+{% for item in releases.tinycore.versions %}
+{% if item.arch == "x86" %}
+item {{ item.code_name }} ${space} ${os} {{ item.name }}
+{% endif %}
+{% endfor %}
+choose version || goto tinycore_exit
+goto ${version}
+
+:x86_64
+menu ${os}
+item --gap  Please choose a version below:
 {% for item in releases.tinycore.versions %}
+{% if item.arch == "x86_64" %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}
+{% endif %}
 {% endfor %}
 choose version || goto tinycore_exit
+goto ${version}
 
-echo ${cls}
+{% for item in releases.tinycore.versions %}
+:{{ item.code_name }}
+set kernel_url ${tinycore_mirror}{{ item.kernel }}
+set initrd_url ${tinycore_mirror}{{ item.initrd }}
+set initrd_name {{ item.initrd | basename }}
+goto boot
+{% endfor %}
 
-kernel ${memdisk} iso raw ${params}
-initrd ${tinycore_mirror}/${dir}/${version}-current.iso
+:boot
+imgfree
+kernel ${kernel_url} loglevel=3 initrd=${initrd_name}
+initrd ${initrd_url}
 boot
 
 :tinycore_exit