From 32c0127106b316e9e7f79bc6492eb1a5887d477a Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Tue, 31 Dec 2019 17:16:54 -0600 Subject: [PATCH 01/10] Update blog url --- README.md | 1 + roles/netbootxyz/templates/menu/about.ipxe.j2 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e81a98e6b1..83f94c313a 100644 --- a/README.md +++ b/README.md @@ -53,6 +53,7 @@ See [netboot.xyz](https://netboot.xyz) for all documentation. Some links to get * [Self Hosting](https://netboot.xyz/selfhosting/) * [Booting Methods](https://netboot.xyz/booting/) * [FAQ](https://netboot.xyz/faq/) +* [Blog](https://blog.netboot.xyz/) 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). diff --git a/roles/netbootxyz/templates/menu/about.ipxe.j2 b/roles/netbootxyz/templates/menu/about.ipxe.j2 index 37fecdc7d2..dce4e722fe 100644 --- a/roles/netbootxyz/templates/menu/about.ipxe.j2 +++ b/roles/netbootxyz/templates/menu/about.ipxe.j2 @@ -20,7 +20,7 @@ menu ${fg_cya}${bold}About netboot.xyz (Version: {{ boot_version }}) item exit ${bold}Exit back to main menu...${boldoff} item --gap -- -------------------------------------------------------------------------- item about ${fg_gre}${bold}Self Hosting and Live Booting - November 29, 2019 -item about ${fg_gre}${bold}Full Article: ${fg_whi}${bold}https://netboot.xyz/blog/ +item about ${fg_gre}${bold}Full Article: ${fg_whi}${bold}https://blog.netboot.xyz item about item about ${fg_yel}${bold}* Self hosting options using Ansible and Docker (soon) item about ${fg_yel}${bold}* Live Boot options now available with more on the way From 7105ee0d1db0433142a3ae78cfb6064c4db59f34 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 31 Dec 2019 23:59:59 +0000 Subject: [PATCH 02/10] Version bump for netbootxyz/debian-squash:deepin-15 new tag 15.11-e47e1f2c --- endpoints.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/endpoints.yml b/endpoints.yml index da6129d91b..fe3fd4da37 100644 --- a/endpoints.yml +++ b/endpoints.yml @@ -593,7 +593,7 @@ endpoints: version: '4' kernel: linux-lite-4-squash deepin-15-squash: - path: /debian-squash/releases/download/15.11-f87a92e4/ + path: /debian-squash/releases/download/15.11-e47e1f2c/ files: - filesystem.squashfs - initrd From a6d86f18388d9e9685358295925ef4eba5c3106c Mon Sep 17 00:00:00 2001 From: thelamer Date: Tue, 31 Dec 2019 16:08:57 -0800 Subject: [PATCH 03/10] need to remove live-cd installer to boot into live mode --- roles/netbootxyz/templates/menu/live-deepin.ipxe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/netbootxyz/templates/menu/live-deepin.ipxe b/roles/netbootxyz/templates/menu/live-deepin.ipxe index f41ce24b5e..4e85278bf1 100644 --- a/roles/netbootxyz/templates/menu/live-deepin.ipxe +++ b/roles/netbootxyz/templates/menu/live-deepin.ipxe @@ -18,7 +18,7 @@ goto live-boot :15-boot imgfree -kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} union=overlay livecd-installer initrd=initrd +kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} union=overlay initrd=initrd initrd ${kernel_url}initrd boot From 5ccc69dacace714fec1a8f854b9a02b215e1d8b3 Mon Sep 17 00:00:00 2001 From: thelamer Date: Tue, 31 Dec 2019 16:42:37 -0800 Subject: [PATCH 04/10] bugfix for neon --- roles/netbootxyz/templates/menu/live-neon.ipxe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/netbootxyz/templates/menu/live-neon.ipxe b/roles/netbootxyz/templates/menu/live-neon.ipxe index 8963a30b44..e6df6ef0d2 100644 --- a/roles/netbootxyz/templates/menu/live-neon.ipxe +++ b/roles/netbootxyz/templates/menu/live-neon.ipxe @@ -14,7 +14,7 @@ goto ${live_version} :user set squash_url ${live_endpoint}{{ endpoints["kde-neon-user"].path }}filesystem.squashfs set kernel_url ${live_endpoint}{{ endpoints["kde-neon-user"].path }} -goto live-boot +goto user-boot :user-boot imgfree From 3cdecb11fba3ef20ccbac0f1c5744d9030182240 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 1 Jan 2020 18:36:29 +0000 Subject: [PATCH 05/10] Version bump for netbootxyz/ubuntu-squash:kde-neon-user new tag 20191226-1116-4cec4542 --- endpoints.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/endpoints.yml b/endpoints.yml index fe3fd4da37..53e33c8540 100644 --- a/endpoints.yml +++ b/endpoints.yml @@ -544,11 +544,12 @@ endpoints: flavor: eoan kernel: voyager-eoan-squash kde-neon-user: - path: /ubuntu-squash/releases/download/20191205-1116-0e301ad7/ + path: /ubuntu-squash/releases/download/20191226-1116-4cec4542/ files: - initrd - vmlinuz - filesystem.squashfs + - initrd.lz os: neon version: '18.04' flavor: user From c3146aa0feafcae1447aa0a06fef5c61c5b30c14 Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 1 Jan 2020 10:59:18 -0800 Subject: [PATCH 06/10] need to manually prune file due to yaml merging --- endpoints.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/endpoints.yml b/endpoints.yml index 53e33c8540..b545a270fa 100644 --- a/endpoints.yml +++ b/endpoints.yml @@ -546,7 +546,6 @@ endpoints: kde-neon-user: path: /ubuntu-squash/releases/download/20191226-1116-4cec4542/ files: - - initrd - vmlinuz - filesystem.squashfs - initrd.lz From 40ffd94df7f611515d66872abdfcd3d3a096196e Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Wed, 1 Jan 2020 14:14:25 -0600 Subject: [PATCH 07/10] Update readme with missing Live OS --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 83f94c313a..dc5ae33e8d 100644 --- a/README.md +++ b/README.md @@ -100,9 +100,11 @@ In addition to being able to host netboot.xyz locally, you can also create your |------------|-----------------|------------------|---------------| |Alpine Linux| https://alpinelinux.org | Yes | No | |Arch Linux | https://www.archlinux.org| Yes | No | +|Backbox|https://www.backbox.org | No | Yes | |BlackArch Linux|https://blackarch.org| ISO - Memdisk | No | |CentOS| https://centos.org | Yes | No | |Debian| https://debian.org | Yes | Yes| +|Deepin| https://www.deepin.org | No | Yes | |Devuan| https://devuan.org | Yes | No | |Elementary OS| https://elementary.io | No | Yes | |Fedora| https://fedoraproject.org | Yes | Yes | @@ -112,6 +114,9 @@ In addition to being able to host netboot.xyz locally, you can also create your |Gentoo|https://gentoo.org| Not Working | No | |IPFire|https://www.ipfire.org| Yes | No | |Kali Linux|https://www.kali.org| Yes | Yes | +|KDE Neon|https://neon.kde.org | No | Yes | +|Linux Lite| https://www.linuxliteos.com | No | Yes | +|Q4OS|https://q4os.org | No | Yes | |Mageia|https://www.mageia.org| Yes | No | |Manjaro|https://manjaro.org| No | Yes | |Mint|https://linuxmint.com| No | Yes | @@ -121,14 +126,18 @@ In addition to being able to host netboot.xyz locally, you can also create your |OpenBSD|https://openbsd.org| Yes | No | |OpenSUSE|https://opensuse.org| Yes | No | |Parrot Security|https://www.parrotsec.org| ISO | No | +|Peppermint|https://peppermintos.com | No | Yes | |Pop OS|https://system76.com/pop| No | Yes | |RancherOS|https://rancher.com/rancher-os| Yes | No | |Red Hat Enterprise Linux|https://www.redhat.com| User supplied media | No | +|Regolith|https://regolith-linux.org| No | Yes | |Scientific Linux|https://scientificlinux.org| Yes | No | |Slackware|https://www.slackware.com| Yes | No | |Tails|https://tails.boum.org | No | Yes | |Tiny Core Linux|https://tinycorelinux.net| ISO - Memdisk | No | |Ubuntu|https://www.ubuntu.com| Yes | Yes | +|Voyager|https://voyagerlive.org | No | Yes | +|Zoris OS|https://zorinos.com| No | Yes | ### Utilities From d64f7cc4fc1b9af3ada449a4e8372e0692024e3b Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Wed, 1 Jan 2020 14:21:48 -0600 Subject: [PATCH 08/10] Bump ArchLinux and BlackArch to 2020.01.01 --- roles/netbootxyz/defaults/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/netbootxyz/defaults/main.yml b/roles/netbootxyz/defaults/main.yml index 726efb25f5..f66e5059cb 100644 --- a/roles/netbootxyz/defaults/main.yml +++ b/roles/netbootxyz/defaults/main.yml @@ -89,15 +89,15 @@ releases: enabled: true menu: "linux" versions: - - name: "2019.12.01" - code_name: "2019.12.01" + - name: "2020.01.01" + code_name: "2020.01.01" blackarch: name: "BlackArch" enabled: true menu: "security" versions: - - name: "2019.09.01" - code_name: "2019.09.01" + - name: "2020.01.01" + code_name: "2020.01.01" centos: name: "CentOS" mirror: "http://mirror.centos.org" From 3b9596fbbd351cd36e122f37aeb5acfbea96459b Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Wed, 1 Jan 2020 20:10:22 -0600 Subject: [PATCH 09/10] Correct timeout for 5 sec in milliseconds --- roles/netbootxyz/templates/menu/menu.ipxe.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/netbootxyz/templates/menu/menu.ipxe.j2 b/roles/netbootxyz/templates/menu/menu.ipxe.j2 index 03d6ff9a11..151c9f5c61 100644 --- a/roles/netbootxyz/templates/menu/menu.ipxe.j2 +++ b/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 --timeout 5 https://boot.netboot.xyz/version.ipxe || +chain --timeout 5000 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" From 61285cbc9acac0f78093b1cf97d7db2d0f993ab0 Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Thu, 2 Jan 2020 15:44:42 -0600 Subject: [PATCH 10/10] Bump release version --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index e9307ca575..50ffc5aa7f 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.0.2 +2.0.3