#802 #888 On UEFI computers, OpenGnsys installs grub to boot from the hard drive. You can use the rEFInd template example for computers without SecureBoot.

5 files changed, 17 insertions, 18 deletions

diff --git a/client/shared/scripts/configureOs b/client/shared/scripts/configureOs
index 2e529c9e..3f39c235 100755
--- a/client/shared/scripts/configureOs
+++ b/client/shared/scripts/configureOs
@@ -70,10 +70,10 @@ case "$OSTYPE" in
         # Cambiar nombre en sistemas Windows.
         HOST=${HOST:-"pc"}
         ogSetWindowsName $1 $2 "$HOST"
-        # Si es UEFI copio el cargador de arranque a la partición EFI e instalo rEFInd.
+        # Si es UEFI copio el cargador de arranque a la partición EFI e instalo Grub.
         if ogIsEfiActive; then
             ogRestoreEfiBootLoader $1 $2
-            ogRefindInstall
+            ogGrubInstallMbr $(ogGetEsp) TRUE
         else
             # Configurar el boot sector de la partición Windows.
             ogFixBootSector $1 $2
@@ -93,10 +93,10 @@ case "$OSTYPE" in
     Linux)      # Postconfiguración de GNU/Linux.
         # Configuro fstab: particion de Swap y si es UEFI además la partición EFI.
         ogConfigureFstab $1 $2
+        # Si es UEFI instalo Grub en la partición EFI
+        ogIsEfiActive && ogGrubInstallMbr $(ogGetEsp) TRUE
         ## Instala (no configura) el codigo de arranque del Grub en la partición (no lo configura, se mantiene el original de la imagen)
         ogGrubInstallPartition $1 $2
-        # Si es UEFI instalo rEFInd.
-        ogIsEfiActive && ogRefindInstall
         # Eliminar el antiguo cliente de Linux.
         [ -n "$(find $MNTDIR/usr/sbin $MNTDIR/sbin $MNTDIR/usr/local/sbin -name ogAdmLnxClient -print)" ] && ogUninstallLinuxClient $1 $2
         # Configurar nuevo agente OGAgent.
@@ -173,4 +173,3 @@ EOT
         ;;
 esac
 exit 0
-
diff --git a/server/tftpboot/grub/default b/server/tftpboot/grub/default
index e5c74035..44620b6b 100644
--- a/server/tftpboot/grub/default
+++ b/server/tftpboot/grub/default
@@ -1,17 +1,17 @@
 # Busca cargadores existentes por orden de prioridad y
 #    muestra menú con las opciones.
 # Si no existe ningún cargador de arranque muestre mensaje de error.
-set timeout=5
+set timeout=30
 
 set detectado='no'
 # Compruebo si existen distintos cargadores.
-echo "Searching rEFInd"
-search --file --set rootRefind /EFI/refind/shimx64.efi.signed
-if [ "$rootRefind" != "" ]; then
+echo "Searching Grub"
+search --file --set rootGrub /EFI/grub/Boot/grubx64.efi
+if [ "$rootGrub" != "" ]; then
     set detectado='si'
-    menuentry "rEFInd" {
-        root="$rootRefind"
-        chainloader /EFI/refind/shimx64.efi.signed
+    menuentry "Grub" {
+        root="$rootGrub"
+        chainloader /EFI/grub/Boot/grubx64.efi
 }
 fi
 
diff --git a/server/tftpboot/grub/examples/grub b/server/tftpboot/grub/examples/grub
deleted file mode 100644
index 5d42c4af..00000000
--- a/server/tftpboot/grub/examples/grub
+++ /dev/null
@@ -1,4 +0,0 @@
-##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/examples/refind b/server/tftpboot/grub/examples/refind
new file mode 100644
index 00000000..77e40c7a
--- /dev/null
+++ b/server/tftpboot/grub/examples/refind
@@ -0,0 +1,4 @@
+##NO-TOCAR-ESTA-LINEA refind
+search --file --set root /EFI/refind/shimx64.efi.signed
+chainloader /EFI/refind/shimx64.efi.signed
+boot
diff --git a/server/tftpboot/grub/templates/10 b/server/tftpboot/grub/templates/10
index 9ed11639..22e57bfe 100644
--- a/server/tftpboot/grub/templates/10
+++ b/server/tftpboot/grub/templates/10
@@ -1,4 +1,4 @@
 ##NO-TOCAR-ESTA-LINEA 1hd
-search --file --set root /EFI/refind/shimx64.efi.signed
-chainloader /EFI/refind/shimx64.efi.signed
+search --file --set root /EFI/grub/Boot/grubx64.efi
+chainloader /EFI/grub/Boot/grubx64.efi
 boot