From 49bdbe9ad83d3c2f7710f81960b3407e882563ac Mon Sep 17 00:00:00 2001
From: Javier Sánchez Parra <jsanchez@soleta.eu>
Date: Mon, 30 May 2022 12:34:33 +0200
Subject: #1075 Rename boot templates

Rename boot templates to improve readability and clarity.
---
 server/tftpboot/grub/templates/00unknown        | 77 -------------------------
 server/tftpboot/grub/templates/10               |  4 --
 server/tftpboot/grub/templates/11               |  4 --
 server/tftpboot/grub/templates/12               |  4 --
 server/tftpboot/grub/templates/13               |  4 --
 server/tftpboot/grub/templates/19pxeADMIN       | 22 -------
 server/tftpboot/grub/templates/disk1            |  4 ++
 server/tftpboot/grub/templates/disk1-part1      |  4 ++
 server/tftpboot/grub/templates/disk1-part2      |  4 ++
 server/tftpboot/grub/templates/disk1-part3      |  4 ++
 server/tftpboot/grub/templates/oglive           | 37 ++++++++++++
 server/tftpboot/grub/templates/oglive-admin     | 22 +++++++
 server/tftpboot/grub/templates/pxe              | 37 ------------
 server/tftpboot/grub/templates/unknown          | 77 +++++++++++++++++++++++++
 server/tftpboot/menu.lst/templates/00unknown    |  6 --
 server/tftpboot/menu.lst/templates/10           |  8 ---
 server/tftpboot/menu.lst/templates/11           |  8 ---
 server/tftpboot/menu.lst/templates/12           |  6 --
 server/tftpboot/menu.lst/templates/13           |  8 ---
 server/tftpboot/menu.lst/templates/19pxeADMIN   | 20 -------
 server/tftpboot/menu.lst/templates/disk1        |  8 +++
 server/tftpboot/menu.lst/templates/disk1-part1  |  8 +++
 server/tftpboot/menu.lst/templates/disk1-part2  |  6 ++
 server/tftpboot/menu.lst/templates/disk1-part3  |  8 +++
 server/tftpboot/menu.lst/templates/oglive       | 38 ++++++++++++
 server/tftpboot/menu.lst/templates/oglive-admin | 20 +++++++
 server/tftpboot/menu.lst/templates/pxe          | 38 ------------
 server/tftpboot/menu.lst/templates/unknown      |  6 ++
 28 files changed, 246 insertions(+), 246 deletions(-)
 delete mode 100644 server/tftpboot/grub/templates/00unknown
 delete mode 100644 server/tftpboot/grub/templates/10
 delete mode 100644 server/tftpboot/grub/templates/11
 delete mode 100644 server/tftpboot/grub/templates/12
 delete mode 100644 server/tftpboot/grub/templates/13
 delete mode 100644 server/tftpboot/grub/templates/19pxeADMIN
 create mode 100644 server/tftpboot/grub/templates/disk1
 create mode 100644 server/tftpboot/grub/templates/disk1-part1
 create mode 100644 server/tftpboot/grub/templates/disk1-part2
 create mode 100644 server/tftpboot/grub/templates/disk1-part3
 create mode 100644 server/tftpboot/grub/templates/oglive
 create mode 100644 server/tftpboot/grub/templates/oglive-admin
 delete mode 100644 server/tftpboot/grub/templates/pxe
 create mode 100644 server/tftpboot/grub/templates/unknown
 delete mode 100644 server/tftpboot/menu.lst/templates/00unknown
 delete mode 100644 server/tftpboot/menu.lst/templates/10
 delete mode 100644 server/tftpboot/menu.lst/templates/11
 delete mode 100644 server/tftpboot/menu.lst/templates/12
 delete mode 100644 server/tftpboot/menu.lst/templates/13
 delete mode 100644 server/tftpboot/menu.lst/templates/19pxeADMIN
 create mode 100644 server/tftpboot/menu.lst/templates/disk1
 create mode 100644 server/tftpboot/menu.lst/templates/disk1-part1
 create mode 100644 server/tftpboot/menu.lst/templates/disk1-part2
 create mode 100644 server/tftpboot/menu.lst/templates/disk1-part3
 create mode 100644 server/tftpboot/menu.lst/templates/oglive
 create mode 100644 server/tftpboot/menu.lst/templates/oglive-admin
 delete mode 100644 server/tftpboot/menu.lst/templates/pxe
 create mode 100644 server/tftpboot/menu.lst/templates/unknown

diff --git a/server/tftpboot/grub/templates/00unknown b/server/tftpboot/grub/templates/00unknown
deleted file mode 100644
index efd70778..00000000
--- a/server/tftpboot/grub/templates/00unknown
+++ /dev/null
@@ -1,77 +0,0 @@
-##NO-TOCAR-ESTA-LINEA Sin-designar
-#
-# Arranque por defecto en OpenGnsys
-# Busca cargadores existentes por orden de prioridad y
-#    muestra menú con las opciones
-# Si no existe ningún cargador de arranque muestra mensaje de error.
-set timeout=30
-
-set detectado='no'
-# Compruebo si existen distintos cargadores.
-echo "Searching Grub"
-search --file --set rootGrub /EFI/grub/Boot/grubx64.efi
-if [ "$rootGrub" != "" ]; then
-    set detectado='si'
-    menuentry "Grub" {
-        root="$rootGrub"
-        chainloader /EFI/grub/Boot/grubx64.efi
-}
-fi
-
-echo "Searching rEFInd"
-search --file --set rootRefind /EFI/refind/shimx64.efi.signed
-if [ "$rootRefind" != "" ]; then
-    menuentry "rEFInd" {
-        root="$rootRefind"
-        chainloader /EFI/refind/shimx64.efi.signed
-}
-fi
-
-echo "Searching Part-01-02"
-search --file --set rootP2 /EFI/Part-01-02/Boot/ogloader.efi
-if [ "$rootP2" != "" ]; then
-    set detectado='si'
-    menuentry "Part-01-02" {
-        root="$rootP2"
-        chainloader /EFI/Part-01-02/Boot/ogloader.efi
-    }
-fi
-
-echo "Searching Part-01-03"
-search --file --set rootP3 /EFI/Part-01-03/Boot/ogloader.efi
-if [ "$rootP3" != "" ]; then
-    set detectado='si'
-    menuentry "Part-01-03" {
-        root="$rootP3"
-        chainloader /EFI/Part-01-03/Boot/ogloader.efi
-    }
-fi
-
-echo "Searching Microsoft"
-search --file --set rootMS /EFI/Microsoft/Boot/bootmgfw.efi
-if [ "$rootMS" != "" ]; then
-    set detectado='si'
-    menuentry "Microsoft" {
-        root="$rootMS"
-        chainloader /EFI/Microsoft/Boot/bootmgfw.efi
-    }
-fi
-
-echo "Searching Ubuntu"
-search --file --set rootUb /EFI/ubuntu/grubx64.efi
-if [ "$rootUb" != "" ]; then
-    set detectado='si'
-    menuentry "Ubuntu"
-        root="$rootUb"
-        chainloader /EFI/ubuntu/grubx64.efi
-    }
-fi
-
-
-# Si no hay ningún sistema operativo muestro mensaje.
-if [ $detectado == 'no' ]; then
-    menuentry "OpenGnsys no ha detectado ningún sistema operativo" {
-        # para evitar mensajes de error.
-        set root="(hd0,gpt1)"
-    }
-fi
diff --git a/server/tftpboot/grub/templates/10 b/server/tftpboot/grub/templates/10
deleted file mode 100644
index 22e57bfe..00000000
--- a/server/tftpboot/grub/templates/10
+++ /dev/null
@@ -1,4 +0,0 @@
-##NO-TOCAR-ESTA-LINEA 1hd
-search --file --set root /EFI/grub/Boot/grubx64.efi
-chainloader /EFI/grub/Boot/grubx64.efi
-boot
diff --git a/server/tftpboot/grub/templates/11 b/server/tftpboot/grub/templates/11
deleted file mode 100644
index e17d387b..00000000
--- a/server/tftpboot/grub/templates/11
+++ /dev/null
@@ -1,4 +0,0 @@
-##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
deleted file mode 100644
index 2bcf108d..00000000
--- a/server/tftpboot/grub/templates/12
+++ /dev/null
@@ -1,4 +0,0 @@
-##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
deleted file mode 100644
index 4c9d26a0..00000000
--- a/server/tftpboot/grub/templates/13
+++ /dev/null
@@ -1,4 +0,0 @@
-##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/grub/templates/19pxeADMIN b/server/tftpboot/grub/templates/19pxeADMIN
deleted file mode 100644
index 211a543b..00000000
--- a/server/tftpboot/grub/templates/19pxeADMIN
+++ /dev/null
@@ -1,22 +0,0 @@
-##NO-TOCAR-ESTA-LINEA ogLiveAdmin
-set timeout=0
-set timeout_style=hidden
-
-set ISODIR=ogLive
-set default=0;
-
-echo "OgLive $ISODIR"
-menuentry "OgLive $ISODIR" {
-    # Si no existe el ogLive de ISODIR en la red, inicio ogLive por defecto
-    for DIR in $ISODIR ogLive; do
-	if linux (tftp)/$DIR/ogvmlinuz ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=true ogdebug=true ogtmpfs=15 oglivedir=$ISODIR INFOHOST ; then
-	    set DIR=$DIR
-	    break
-	else
-	    echo "OgLive default"
-	fi
-    done
-
-    initrd (tftp)/$DIR/oginitrd.img
-    boot
-}
diff --git a/server/tftpboot/grub/templates/disk1 b/server/tftpboot/grub/templates/disk1
new file mode 100644
index 00000000..22e57bfe
--- /dev/null
+++ b/server/tftpboot/grub/templates/disk1
@@ -0,0 +1,4 @@
+##NO-TOCAR-ESTA-LINEA 1hd
+search --file --set root /EFI/grub/Boot/grubx64.efi
+chainloader /EFI/grub/Boot/grubx64.efi
+boot
diff --git a/server/tftpboot/grub/templates/disk1-part1 b/server/tftpboot/grub/templates/disk1-part1
new file mode 100644
index 00000000..e17d387b
--- /dev/null
+++ b/server/tftpboot/grub/templates/disk1-part1
@@ -0,0 +1,4 @@
+##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/disk1-part2 b/server/tftpboot/grub/templates/disk1-part2
new file mode 100644
index 00000000..2bcf108d
--- /dev/null
+++ b/server/tftpboot/grub/templates/disk1-part2
@@ -0,0 +1,4 @@
+##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/disk1-part3 b/server/tftpboot/grub/templates/disk1-part3
new file mode 100644
index 00000000..4c9d26a0
--- /dev/null
+++ b/server/tftpboot/grub/templates/disk1-part3
@@ -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/grub/templates/oglive b/server/tftpboot/grub/templates/oglive
new file mode 100644
index 00000000..1a67fc25
--- /dev/null
+++ b/server/tftpboot/grub/templates/oglive
@@ -0,0 +1,37 @@
+##NO-TOCAR-ESTA-LINEA ogLive
+set timeout=0
+set timeout_style=hidden
+
+set ISODIR=ogLive
+
+# Si existe ogLive en CACHE lo inicio, si no el de la red
+set root=''
+echo "OgLive CACHE"
+search --file --set root /boot/$ISODIR/ogvmlinuz
+if [ "$root" == "" ]; then
+    echo "OgLive $ISODIR"
+    set default=1;
+else
+    set default=0;
+fi
+
+menuentry "OgLive CACHE" {
+    linux /boot/$ISODIR/ogvmlinuz ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=false ogdebug=false ogupdateinitrd=true ogtmpfs=15 oglivedir=$ISODIR INFOHOST
+    initrd /boot/$ISODIR/oginitrd.img
+    boot
+}
+
+menuentry "OgLive $ISODIR" {
+    # Si no existe el ogLive de ISODIR en la red, inicio ogLive por defecto
+    for DIR in $ISODIR ogLive; do
+	if linux (tftp)/$DIR/ogvmlinuz ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=false ogdebug=false ogtmpfs=15 oglivedir=$ISODIR INFOHOST ; then
+	    set DIR=$DIR
+	    break
+        else
+	    echo "OgLive default"
+	fi
+    done
+
+    initrd (tftp)/$DIR/oginitrd.img
+    boot
+}
diff --git a/server/tftpboot/grub/templates/oglive-admin b/server/tftpboot/grub/templates/oglive-admin
new file mode 100644
index 00000000..211a543b
--- /dev/null
+++ b/server/tftpboot/grub/templates/oglive-admin
@@ -0,0 +1,22 @@
+##NO-TOCAR-ESTA-LINEA ogLiveAdmin
+set timeout=0
+set timeout_style=hidden
+
+set ISODIR=ogLive
+set default=0;
+
+echo "OgLive $ISODIR"
+menuentry "OgLive $ISODIR" {
+    # Si no existe el ogLive de ISODIR en la red, inicio ogLive por defecto
+    for DIR in $ISODIR ogLive; do
+	if linux (tftp)/$DIR/ogvmlinuz ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=true ogdebug=true ogtmpfs=15 oglivedir=$ISODIR INFOHOST ; then
+	    set DIR=$DIR
+	    break
+	else
+	    echo "OgLive default"
+	fi
+    done
+
+    initrd (tftp)/$DIR/oginitrd.img
+    boot
+}
diff --git a/server/tftpboot/grub/templates/pxe b/server/tftpboot/grub/templates/pxe
deleted file mode 100644
index 1a67fc25..00000000
--- a/server/tftpboot/grub/templates/pxe
+++ /dev/null
@@ -1,37 +0,0 @@
-##NO-TOCAR-ESTA-LINEA ogLive
-set timeout=0
-set timeout_style=hidden
-
-set ISODIR=ogLive
-
-# Si existe ogLive en CACHE lo inicio, si no el de la red
-set root=''
-echo "OgLive CACHE"
-search --file --set root /boot/$ISODIR/ogvmlinuz
-if [ "$root" == "" ]; then
-    echo "OgLive $ISODIR"
-    set default=1;
-else
-    set default=0;
-fi
-
-menuentry "OgLive CACHE" {
-    linux /boot/$ISODIR/ogvmlinuz ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=false ogdebug=false ogupdateinitrd=true ogtmpfs=15 oglivedir=$ISODIR INFOHOST
-    initrd /boot/$ISODIR/oginitrd.img
-    boot
-}
-
-menuentry "OgLive $ISODIR" {
-    # Si no existe el ogLive de ISODIR en la red, inicio ogLive por defecto
-    for DIR in $ISODIR ogLive; do
-	if linux (tftp)/$DIR/ogvmlinuz ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=false ogdebug=false ogtmpfs=15 oglivedir=$ISODIR INFOHOST ; then
-	    set DIR=$DIR
-	    break
-        else
-	    echo "OgLive default"
-	fi
-    done
-
-    initrd (tftp)/$DIR/oginitrd.img
-    boot
-}
diff --git a/server/tftpboot/grub/templates/unknown b/server/tftpboot/grub/templates/unknown
new file mode 100644
index 00000000..efd70778
--- /dev/null
+++ b/server/tftpboot/grub/templates/unknown
@@ -0,0 +1,77 @@
+##NO-TOCAR-ESTA-LINEA Sin-designar
+#
+# Arranque por defecto en OpenGnsys
+# Busca cargadores existentes por orden de prioridad y
+#    muestra menú con las opciones
+# Si no existe ningún cargador de arranque muestra mensaje de error.
+set timeout=30
+
+set detectado='no'
+# Compruebo si existen distintos cargadores.
+echo "Searching Grub"
+search --file --set rootGrub /EFI/grub/Boot/grubx64.efi
+if [ "$rootGrub" != "" ]; then
+    set detectado='si'
+    menuentry "Grub" {
+        root="$rootGrub"
+        chainloader /EFI/grub/Boot/grubx64.efi
+}
+fi
+
+echo "Searching rEFInd"
+search --file --set rootRefind /EFI/refind/shimx64.efi.signed
+if [ "$rootRefind" != "" ]; then
+    menuentry "rEFInd" {
+        root="$rootRefind"
+        chainloader /EFI/refind/shimx64.efi.signed
+}
+fi
+
+echo "Searching Part-01-02"
+search --file --set rootP2 /EFI/Part-01-02/Boot/ogloader.efi
+if [ "$rootP2" != "" ]; then
+    set detectado='si'
+    menuentry "Part-01-02" {
+        root="$rootP2"
+        chainloader /EFI/Part-01-02/Boot/ogloader.efi
+    }
+fi
+
+echo "Searching Part-01-03"
+search --file --set rootP3 /EFI/Part-01-03/Boot/ogloader.efi
+if [ "$rootP3" != "" ]; then
+    set detectado='si'
+    menuentry "Part-01-03" {
+        root="$rootP3"
+        chainloader /EFI/Part-01-03/Boot/ogloader.efi
+    }
+fi
+
+echo "Searching Microsoft"
+search --file --set rootMS /EFI/Microsoft/Boot/bootmgfw.efi
+if [ "$rootMS" != "" ]; then
+    set detectado='si'
+    menuentry "Microsoft" {
+        root="$rootMS"
+        chainloader /EFI/Microsoft/Boot/bootmgfw.efi
+    }
+fi
+
+echo "Searching Ubuntu"
+search --file --set rootUb /EFI/ubuntu/grubx64.efi
+if [ "$rootUb" != "" ]; then
+    set detectado='si'
+    menuentry "Ubuntu"
+        root="$rootUb"
+        chainloader /EFI/ubuntu/grubx64.efi
+    }
+fi
+
+
+# Si no hay ningún sistema operativo muestro mensaje.
+if [ $detectado == 'no' ]; then
+    menuentry "OpenGnsys no ha detectado ningún sistema operativo" {
+        # para evitar mensajes de error.
+        set root="(hd0,gpt1)"
+    }
+fi
diff --git a/server/tftpboot/menu.lst/templates/00unknown b/server/tftpboot/menu.lst/templates/00unknown
deleted file mode 100644
index eaf70de7..00000000
--- a/server/tftpboot/menu.lst/templates/00unknown
+++ /dev/null
@@ -1,6 +0,0 @@
-##NO-TOCAR-ESTA-LINEA Sin-designar
-timeout 1
-title  MBR
-chainloader (hd0)+1
-rootnoverify (hd0) 
-boot
\ No newline at end of file
diff --git a/server/tftpboot/menu.lst/templates/10 b/server/tftpboot/menu.lst/templates/10
deleted file mode 100644
index 96d0f500..00000000
--- a/server/tftpboot/menu.lst/templates/10
+++ /dev/null
@@ -1,8 +0,0 @@
-##NO-TOCAR-ESTA-LINEA 1hd
-timeout 1
-title  MBR
-chainloader (hd0)+1
-rootnoverify (hd0) 
-boot
-
-
diff --git a/server/tftpboot/menu.lst/templates/11 b/server/tftpboot/menu.lst/templates/11
deleted file mode 100644
index 6635b495..00000000
--- a/server/tftpboot/menu.lst/templates/11
+++ /dev/null
@@ -1,8 +0,0 @@
-##NO-TOCAR-ESTA-LINEA 1hd-1partition
-timeout 1
-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
deleted file mode 100644
index 0843c3b1..00000000
--- a/server/tftpboot/menu.lst/templates/12
+++ /dev/null
@@ -1,6 +0,0 @@
-##NO-TOCAR-ESTA-LINEA 1hd-2partition
-timeout 1
-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
deleted file mode 100644
index fedf8ebf..00000000
--- a/server/tftpboot/menu.lst/templates/13
+++ /dev/null
@@ -1,8 +0,0 @@
-##NO-TOCAR-ESTA-LINEA 1hd-3partition
-timeout 1
-title FirstDisk-ThirdPartition
-root (hd0,2)
-chainloader (hd0,2)+1
-boot
-
-
diff --git a/server/tftpboot/menu.lst/templates/19pxeADMIN b/server/tftpboot/menu.lst/templates/19pxeADMIN
deleted file mode 100644
index c2a6e4ba..00000000
--- a/server/tftpboot/menu.lst/templates/19pxeADMIN
+++ /dev/null
@@ -1,20 +0,0 @@
-##NO-TOCAR-ESTA-LINEA ogLiveAdmin
-default saved
-timeout 1
-hiddenmenu
-fallback 1 2 3
-
-
-set ISODIR=ogLive
-
-title OpenGnsys-NET
-kernel (pd)/%ISODIR%/ogvmlinuz  ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=true ogdebug=true ogupdateinitrd=true ogtmpfs=15 oglivedir=%ISODIR% INFOHOST 
-initrd (pd)/%ISODIR%/oginitrd.img
-boot
-
-
-title OpenGnsys-NET default
-kernel (pd)/ogLive/ogvmlinuz  ro boot=oginit vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=true ogdebug=true ogupdateinitrd=true ogtmpfs=15 oglivedir=ogLive INFOHOST 
-initrd (pd)/ogLive/oginitrd.img
-boot
-
diff --git a/server/tftpboot/menu.lst/templates/disk1 b/server/tftpboot/menu.lst/templates/disk1
new file mode 100644
index 00000000..96d0f500
--- /dev/null
+++ b/server/tftpboot/menu.lst/templates/disk1
@@ -0,0 +1,8 @@
+##NO-TOCAR-ESTA-LINEA 1hd
+timeout 1
+title  MBR
+chainloader (hd0)+1
+rootnoverify (hd0) 
+boot
+
+
diff --git a/server/tftpboot/menu.lst/templates/disk1-part1 b/server/tftpboot/menu.lst/templates/disk1-part1
new file mode 100644
index 00000000..6635b495
--- /dev/null
+++ b/server/tftpboot/menu.lst/templates/disk1-part1
@@ -0,0 +1,8 @@
+##NO-TOCAR-ESTA-LINEA 1hd-1partition
+timeout 1
+title FirstDisk-FirstPartition
+root (hd0,0)
+chainloader (hd0,0)+1
+boot
+
+
diff --git a/server/tftpboot/menu.lst/templates/disk1-part2 b/server/tftpboot/menu.lst/templates/disk1-part2
new file mode 100644
index 00000000..0843c3b1
--- /dev/null
+++ b/server/tftpboot/menu.lst/templates/disk1-part2
@@ -0,0 +1,6 @@
+##NO-TOCAR-ESTA-LINEA 1hd-2partition
+timeout 1
+title FirstHardDisk-SecondPartition
+root (hd0,1)
+chainloader (hd0,1)+1
+boot
diff --git a/server/tftpboot/menu.lst/templates/disk1-part3 b/server/tftpboot/menu.lst/templates/disk1-part3
new file mode 100644
index 00000000..fedf8ebf
--- /dev/null
+++ b/server/tftpboot/menu.lst/templates/disk1-part3
@@ -0,0 +1,8 @@
+##NO-TOCAR-ESTA-LINEA 1hd-3partition
+timeout 1
+title FirstDisk-ThirdPartition
+root (hd0,2)
+chainloader (hd0,2)+1
+boot
+
+
diff --git a/server/tftpboot/menu.lst/templates/oglive b/server/tftpboot/menu.lst/templates/oglive
new file mode 100644
index 00000000..251b8a74
--- /dev/null
+++ b/server/tftpboot/menu.lst/templates/oglive
@@ -0,0 +1,38 @@
+##NO-TOCAR-ESTA-LINEA ogLive
+default saved
+timeout 1
+hiddenmenu
+fallback 1 2 3 4
+
+set ISODIR=ogLive
+
+
+title firsboot
+find --set-root --ignore-floppies --ignore-cd /ogboot.me checkrange 0x07 parttype > nul
+cmp /ogboot.me /ogboot.firstboot || ls FALLBACK
+write /ogboot.firstboot iniciado
+chainloader +1
+boot
+
+title secondboot
+find --set-root --ignore-floppies --ignore-cd /ogboot.me checkrange 0x07 parttype > nul
+cmp /ogboot.me /ogboot.secondboot || ls FALLBACK
+write /ogboot.secondboot iniciado
+chainloader +1
+boot
+
+title OpenGnsys-CACHE
+find --set-root --ignore-floppies --ignore-cd /boot/%ISODIR%/ogvmlinuz
+kernel /boot/%ISODIR%/ogvmlinuz ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=false ogdebug=false ogupdateinitrd=true ogtmpfs=15 oglivedir=%ISODIR% INFOHOST 
+initrd /boot/%ISODIR%/oginitrd.img
+boot
+
+title OpenGnsys-NET
+kernel (pd)/%ISODIR%/ogvmlinuz  ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=false ogdebug=false ogtmpfs=15 oglivedir=%ISODIR% INFOHOST 
+initrd (pd)/%ISODIR%/oginitrd.img
+boot
+
+title OpenGnsys-NET default
+kernel (pd)/ogLive/ogvmlinuz  ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=false ogdebug=false ogtmpfs=15 oglivedir=ogLive INFOHOST
+initrd (pd)/ogLive/oginitrd.img
+boot
diff --git a/server/tftpboot/menu.lst/templates/oglive-admin b/server/tftpboot/menu.lst/templates/oglive-admin
new file mode 100644
index 00000000..c2a6e4ba
--- /dev/null
+++ b/server/tftpboot/menu.lst/templates/oglive-admin
@@ -0,0 +1,20 @@
+##NO-TOCAR-ESTA-LINEA ogLiveAdmin
+default saved
+timeout 1
+hiddenmenu
+fallback 1 2 3
+
+
+set ISODIR=ogLive
+
+title OpenGnsys-NET
+kernel (pd)/%ISODIR%/ogvmlinuz  ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=true ogdebug=true ogupdateinitrd=true ogtmpfs=15 oglivedir=%ISODIR% INFOHOST 
+initrd (pd)/%ISODIR%/oginitrd.img
+boot
+
+
+title OpenGnsys-NET default
+kernel (pd)/ogLive/ogvmlinuz  ro boot=oginit vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=true ogdebug=true ogupdateinitrd=true ogtmpfs=15 oglivedir=ogLive INFOHOST 
+initrd (pd)/ogLive/oginitrd.img
+boot
+
diff --git a/server/tftpboot/menu.lst/templates/pxe b/server/tftpboot/menu.lst/templates/pxe
deleted file mode 100644
index 251b8a74..00000000
--- a/server/tftpboot/menu.lst/templates/pxe
+++ /dev/null
@@ -1,38 +0,0 @@
-##NO-TOCAR-ESTA-LINEA ogLive
-default saved
-timeout 1
-hiddenmenu
-fallback 1 2 3 4
-
-set ISODIR=ogLive
-
-
-title firsboot
-find --set-root --ignore-floppies --ignore-cd /ogboot.me checkrange 0x07 parttype > nul
-cmp /ogboot.me /ogboot.firstboot || ls FALLBACK
-write /ogboot.firstboot iniciado
-chainloader +1
-boot
-
-title secondboot
-find --set-root --ignore-floppies --ignore-cd /ogboot.me checkrange 0x07 parttype > nul
-cmp /ogboot.me /ogboot.secondboot || ls FALLBACK
-write /ogboot.secondboot iniciado
-chainloader +1
-boot
-
-title OpenGnsys-CACHE
-find --set-root --ignore-floppies --ignore-cd /boot/%ISODIR%/ogvmlinuz
-kernel /boot/%ISODIR%/ogvmlinuz ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=false ogdebug=false ogupdateinitrd=true ogtmpfs=15 oglivedir=%ISODIR% INFOHOST 
-initrd /boot/%ISODIR%/oginitrd.img
-boot
-
-title OpenGnsys-NET
-kernel (pd)/%ISODIR%/ogvmlinuz  ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=false ogdebug=false ogtmpfs=15 oglivedir=%ISODIR% INFOHOST 
-initrd (pd)/%ISODIR%/oginitrd.img
-boot
-
-title OpenGnsys-NET default
-kernel (pd)/ogLive/ogvmlinuz  ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=false ogdebug=false ogtmpfs=15 oglivedir=ogLive INFOHOST
-initrd (pd)/ogLive/oginitrd.img
-boot
diff --git a/server/tftpboot/menu.lst/templates/unknown b/server/tftpboot/menu.lst/templates/unknown
new file mode 100644
index 00000000..eaf70de7
--- /dev/null
+++ b/server/tftpboot/menu.lst/templates/unknown
@@ -0,0 +1,6 @@
+##NO-TOCAR-ESTA-LINEA Sin-designar
+timeout 1
+title  MBR
+chainloader (hd0)+1
+rootnoverify (hd0) 
+boot
\ No newline at end of file
-- 
cgit v1.2.3-18-g5258