HOTFIX-4 (#845)

Add MIT license in top of tools Fix PXE small issues found during testings of validation tool
bluebanquise · Nov 8, 2023 · 606683e · 606683e
1 parent 6e4b107
commit 606683e
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 7 deletions.
diff --git a/collections/infrastructure/roles/pxe_stack/files/bluebanquise-bootset b/collections/infrastructure/roles/pxe_stack/files/bluebanquise-bootset
@@ -12,8 +12,33 @@
 #   - Adrien Ribeiro <adrien.ribeiro@atos.net>
 #   - Bruno Travouillon <devel@travouillon.fr>
 #   - johnnykeats <johnny.keats@outlook.com>
+
 # https://github.com/bluebanquise/bluebanquise - MIT license
 
+
+# MIT License
+
+# Copyright (c) 2019-2023 BlueBanquise Team, https://github.com/bluebanquise/bluebanquise
+
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
 import grp
 import logging
 import os

diff --git a/collections/infrastructure/roles/pxe_stack/files/bluebanquise-diskless b/collections/infrastructure/roles/pxe_stack/files/bluebanquise-diskless
@@ -23,8 +23,28 @@
 # https://github.com/bluebanquise/bluebanquise - MIT license
 
 
-# This file is under MIT license
-# You are however asked to not remove header and any references to BlueBanquise project.
+# MIT License
+
+# Copyright (c) 2019-2023 BlueBanquise Team, https://github.com/bluebanquise/bluebanquise
+
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 
 
 """

diff --git a/collections/infrastructure/roles/pxe_stack/templates/Clonezilla/clone.ipxe.j2 b/collections/infrastructure/roles/pxe_stack/templates/Clonezilla/clone.ipxe.j2
@@ -15,7 +15,7 @@ echo |
 echo | Loading linux ...
 
 :kernel-line
-kernel http://${next-server}/pxe/tools/clonezilla/vmlinuz initrd=initrd.img fetch=http://${next-server}/pxe/tools/clonezilla/filesystem.squashfs boot=live union=overlay username=user hostname=bluebanquise config components noswap edd=on nomodeset vga=788 ip=dhcp net.ifnames=0 splash i915.blacklist=yes radeonhd.blacklist=yes nouveau.blacklist=yes vmwgfx.enable_fbdev=1 ${eq-kernel-parameters} ${dedicated-kernel-parameters} ${eq-console}
+kernel http://${next-server}/pxe/tools/clonezilla/vmlinuz initrd=initrd.img fetch=http://${next-server}/pxe/tools/clonezilla/filesystem.squashfs boot=live union=overlay username=user hostname=bluebanquise config components noswap edd=on nomodeset vga=788 net.ifnames=0 splash i915.blacklist=yes radeonhd.blacklist=yes nouveau.blacklist=yes vmwgfx.enable_fbdev=1 ${eq-kernel-parameters} ${dedicated-kernel-parameters} ${eq-console}
 
 echo | Loading initial ramdisk ...
 

diff --git a/collections/infrastructure/roles/pxe_stack/templates/menu.ipxe.j2 b/collections/infrastructure/roles/pxe_stack/templates/menu.ipxe.j2
@@ -29,7 +29,6 @@ item bootdiskless         Start a diskless OS (Configured using diskless tool)
 {% endif %}
 item --gap                Tools
 {% if pxe_stack_enable_clonezilla %}
-item --gap                Cloning
 item bootclone            Clonezilla live - Clone/Deploy OS
 item bootautoclone        Auto Clone (advanced)
 item bootautodeploy       Auto Deploy (advanced)
@@ -91,13 +90,13 @@ chain http://${next-server}/pxe/osdeploy/${eq-distribution}_${eq-distribution-ma
 chain http://${next-server}/pxe/diskless/${node-image}/boot.ipxe || shell
 
 :bootclone
-chain http://${next-server}/pxe/clonezilla/clone.ipxe
+chain http://${next-server}/pxe/tools/clonezilla/clone.ipxe
 
 :bootautoclone
-chain http://${next-server}/pxe/clonezilla/autoclone.ipxe
+chain http://${next-server}/pxe/tools/clonezilla/autoclone.ipxe
 
 :bootautodeploy
-chain http://${next-server}/pxe/clonezilla/autodeploy.ipxe
+chain http://${next-server}/pxe/tools/clonezilla/autodeploy.ipxe
 
 :bootalpinelive 
 chain http://${next-server}/pxe/tools/alpine/boot.ipxe