#802 #888 PXE templates support EFI partition in whichever partition. Example template for boot with grub.

10 files changed, 27 insertions, 17 deletions

diff --git a/installer/opengnsys_import.sh b/installer/opengnsys_import.sh
index 528b8c3e..30df2f37 100755
--- a/installer/opengnsys_import.sh
+++ b/installer/opengnsys_import.sh
@@ -327,8 +327,6 @@ if [ -f $OPENGNSYS/tftpboot/menu.lst/templates/01 ]; then
     BIOSPXEDIR="$OPENGNSYS/tftpboot/menu.lst/templates"
     mv $BIOSPXEDIR/01 $BIOSPXEDIR/10
     sed -i "s/\bMBR\b/1hd/" $BIOSPXEDIR/10
-    sed -i "s/\b1hd-1partition\b/1hd-1os/" $BIOSPXEDIR/11
-    sed -i "s/\b1hd-2partition\b/1hd-2os/" $BIOSPXEDIR/12
 
     # Cambiamos el valor en la base de datos. Si no lo hacemos desaparecen de las columnas del NetBootAvanzado.
     mysql --defaults-extra-file=$MYCNF -D "$CATALOG" -e "update ordenadores set arranque='10' where arranque='01';" &>/dev/null
diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh
index b418b639..5c74b987 100755
--- a/installer/opengnsys_update.sh
+++ b/installer/opengnsys_update.sh
@@ -943,8 +943,6 @@ function updateServerFiles()
             BIOSPXEDIR="$INSTALL_TARGET/tftpboot/menu.lst/templates"
 	    mv $BIOSPXEDIR/01 $BIOSPXEDIR/10
 	    sed -i "s/\bMBR\b/1hd/" $BIOSPXEDIR/10
-	    sed -i "s/\b1hd-1partition\b/1hd-1os/" $BIOSPXEDIR/11
-	    sed -i "s/\b1hd-2partition\b/1hd-2os/" $BIOSPXEDIR/12
 	fi
 }
 
diff --git a/server/tftpboot/grub/examples/grub b/server/tftpboot/grub/examples/grub
new file mode 100644
index 00000000..5d42c4af
--- /dev/null
+++ b/server/tftpboot/grub/examples/grub
@@ -0,0 +1,4 @@
+##NO-TOCAR-ESTA-LINEA grub
+search --file --set root /EFI/grub/Boot/grubx64.efi
+chainloader /EFI/grub/Boot/grubx64.efi
+boot
diff --git a/server/tftpboot/grub/templates/10 b/server/tftpboot/grub/templates/10
index 82c44464..9ed11639 100644
--- a/server/tftpboot/grub/templates/10
+++ b/server/tftpboot/grub/templates/10
@@ -1,6 +1,4 @@
 ##NO-TOCAR-ESTA-LINEA 1hd
-echo "rEFInd"
-
-root='hd0,gpt1'
+search --file --set root /EFI/refind/shimx64.efi.signed
 chainloader /EFI/refind/shimx64.efi.signed
 boot
diff --git a/server/tftpboot/grub/templates/11 b/server/tftpboot/grub/templates/11
index 06b34088..e17d387b 100644
--- a/server/tftpboot/grub/templates/11
+++ b/server/tftpboot/grub/templates/11
@@ -1,4 +1,4 @@
-##NO-TOCAR-ESTA-LINEA 1hd-1os
-root='hd0,gpt1'
-chainloader /EFI/Part-01-02/Boot/ogloader.efi
+##NO-TOCAR-ESTA-LINEA 1hd-1partition
+search --file --set root /EFI/Part-01-01/Boot/ogloader.efi
+chainloader /EFI/Part-01-01/Boot/ogloader.efi
 boot
diff --git a/server/tftpboot/grub/templates/12 b/server/tftpboot/grub/templates/12
index 6f22fc30..2bcf108d 100644
--- a/server/tftpboot/grub/templates/12
+++ b/server/tftpboot/grub/templates/12
@@ -1,4 +1,4 @@
-##NO-TOCAR-ESTA-LINEA 1hd-2os
-root='hd0,gpt1'
-chainloader /EFI/Part-01-03/Boot/ogloader.efi
+##NO-TOCAR-ESTA-LINEA 1hd-2partition
+search --file --set root /EFI/Part-01-02/Boot/ogloader.efi
+chainloader /EFI/Part-01-02/Boot/ogloader.efi
 boot
diff --git a/server/tftpboot/grub/templates/13 b/server/tftpboot/grub/templates/13
new file mode 100644
index 00000000..4c9d26a0
--- /dev/null
+++ b/server/tftpboot/grub/templates/13
@@ -0,0 +1,4 @@
+##NO-TOCAR-ESTA-LINEA 1hd-3partition
+search --file --set root /EFI/Part-01-03/Boot/ogloader.efi
+chainloader /EFI/Part-01-03/Boot/ogloader.efi
+boot
diff --git a/server/tftpboot/menu.lst/templates/11 b/server/tftpboot/menu.lst/templates/11
index c1492b57..6635b495 100644
--- a/server/tftpboot/menu.lst/templates/11
+++ b/server/tftpboot/menu.lst/templates/11
@@ -1,6 +1,6 @@
-##NO-TOCAR-ESTA-LINEA 1hd-1os
+##NO-TOCAR-ESTA-LINEA 1hd-1partition
 timeout 1
-title FirstDisk-FirstOperatingSystem
+title FirstDisk-FirstPartition
 root (hd0,0)
 chainloader (hd0,0)+1
 boot
diff --git a/server/tftpboot/menu.lst/templates/12 b/server/tftpboot/menu.lst/templates/12
index 0db966b7..0843c3b1 100644
--- a/server/tftpboot/menu.lst/templates/12
+++ b/server/tftpboot/menu.lst/templates/12
@@ -1,6 +1,6 @@
-##NO-TOCAR-ESTA-LINEA 1hd-2os
+##NO-TOCAR-ESTA-LINEA 1hd-2partition
 timeout 1
-title FirstHardDisk-SecondOperatingSystem
+title FirstHardDisk-SecondPartition
 root (hd0,1)
 chainloader (hd0,1)+1
 boot
diff --git a/server/tftpboot/menu.lst/templates/13 b/server/tftpboot/menu.lst/templates/13
new file mode 100644
index 00000000..fedf8ebf
--- /dev/null
+++ b/server/tftpboot/menu.lst/templates/13
@@ -0,0 +1,8 @@
+##NO-TOCAR-ESTA-LINEA 1hd-3partition
+timeout 1
+title FirstDisk-ThirdPartition
+root (hd0,2)
+chainloader (hd0,2)+1
+boot
+
+