From 5c2fe9b80b8cc48d9ac2c72b14f7c7ecfc3e9e03 Mon Sep 17 00:00:00 2001
From: Irina Gómez <irinagomez@us.es>
Date: Fri, 29 Mar 2019 13:52:05 +0100
Subject: #860 #802 #888 For UEFI and BIOS coherence , the PXE templates are
 rename.

---
 server/tftpboot/grub/templates/11       | 4 ++++
 server/tftpboot/grub/templates/12       | 4 ++--
 server/tftpboot/grub/templates/13       | 4 ----
 server/tftpboot/grub/templates/fedora   | 4 ----
 server/tftpboot/grub/templates/opensuse | 4 ----
 server/tftpboot/grub/templates/ubuntu   | 4 ----
 server/tftpboot/grub/templates/windows  | 4 ----
 server/tftpboot/menu.lst/templates/01   | 8 --------
 server/tftpboot/menu.lst/templates/10   | 8 ++++++++
 server/tftpboot/menu.lst/templates/11   | 4 ++--
 server/tftpboot/menu.lst/templates/12   | 4 ++--
 11 files changed, 18 insertions(+), 34 deletions(-)
 create mode 100644 server/tftpboot/grub/templates/11
 delete mode 100644 server/tftpboot/grub/templates/13
 delete mode 100644 server/tftpboot/grub/templates/fedora
 delete mode 100644 server/tftpboot/grub/templates/opensuse
 delete mode 100644 server/tftpboot/grub/templates/ubuntu
 delete mode 100644 server/tftpboot/grub/templates/windows
 delete mode 100644 server/tftpboot/menu.lst/templates/01
 create mode 100644 server/tftpboot/menu.lst/templates/10

diff --git a/server/tftpboot/grub/templates/11 b/server/tftpboot/grub/templates/11
new file mode 100644
index 00000000..06b34088
--- /dev/null
+++ b/server/tftpboot/grub/templates/11
@@ -0,0 +1,4 @@
+##NO-TOCAR-ESTA-LINEA 1hd-1os
+root='hd0,gpt1'
+chainloader /EFI/Part-01-02/Boot/ogloader.efi
+boot
diff --git a/server/tftpboot/grub/templates/12 b/server/tftpboot/grub/templates/12
index dea74d35..6f22fc30 100644
--- a/server/tftpboot/grub/templates/12
+++ b/server/tftpboot/grub/templates/12
@@ -1,4 +1,4 @@
-##NO-TOCAR-ESTA-LINEA 1hd-2partition
+##NO-TOCAR-ESTA-LINEA 1hd-2os
 root='hd0,gpt1'
-chainloader /EFI/Part-01-02/Boot/ogloader.efi
+chainloader /EFI/Part-01-03/Boot/ogloader.efi
 boot
diff --git a/server/tftpboot/grub/templates/13 b/server/tftpboot/grub/templates/13
deleted file mode 100644
index 2924d05c..00000000
--- a/server/tftpboot/grub/templates/13
+++ /dev/null
@@ -1,4 +0,0 @@
-##NO-TOCAR-ESTA-LINEA 1hd-3partition 
-root='hd0,gpt1'
-chainloader /EFI/Part-01-03/Boot/ogloader.efi
-boot
diff --git a/server/tftpboot/grub/templates/fedora b/server/tftpboot/grub/templates/fedora
deleted file mode 100644
index d8f96201..00000000
--- a/server/tftpboot/grub/templates/fedora
+++ /dev/null
@@ -1,4 +0,0 @@
-##NO-TOCAR-ESTA-LINEA Fedora
-root='hd0,gpt1'
-chainloader /EFI/fedora/grubx64.efi
-boot
diff --git a/server/tftpboot/grub/templates/opensuse b/server/tftpboot/grub/templates/opensuse
deleted file mode 100644
index 719367cc..00000000
--- a/server/tftpboot/grub/templates/opensuse
+++ /dev/null
@@ -1,4 +0,0 @@
-##NO-TOCAR-ESTA-LINEA OpenSuse
-root='hd0,gpt1'
-chainloader /EFI/opensuse/grubx64.efi
-boot
diff --git a/server/tftpboot/grub/templates/ubuntu b/server/tftpboot/grub/templates/ubuntu
deleted file mode 100644
index 386f541c..00000000
--- a/server/tftpboot/grub/templates/ubuntu
+++ /dev/null
@@ -1,4 +0,0 @@
-##NO-TOCAR-ESTA-LINEA Ubuntu
-root='hd0,gpt1'
-chainloader /EFI/ubuntu/grubx64.efi
-boot
diff --git a/server/tftpboot/grub/templates/windows b/server/tftpboot/grub/templates/windows
deleted file mode 100644
index 333db4e2..00000000
--- a/server/tftpboot/grub/templates/windows
+++ /dev/null
@@ -1,4 +0,0 @@
-##NO-TOCAR-ESTA-LINEA Windows
-root='hd0,gpt1'
-chainloader /EFI/Microsoft/Boot/bootmgfw.efi
-boot
diff --git a/server/tftpboot/menu.lst/templates/01 b/server/tftpboot/menu.lst/templates/01
deleted file mode 100644
index db7a3ee7..00000000
--- a/server/tftpboot/menu.lst/templates/01
+++ /dev/null
@@ -1,8 +0,0 @@
-##NO-TOCAR-ESTA-LINEA MBR
-timeout 1
-title  MBR
-chainloader (hd0)+1
-rootnoverify (hd0) 
-boot
-
-
diff --git a/server/tftpboot/menu.lst/templates/10 b/server/tftpboot/menu.lst/templates/10
new file mode 100644
index 00000000..96d0f500
--- /dev/null
+++ b/server/tftpboot/menu.lst/templates/10
@@ -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/11 b/server/tftpboot/menu.lst/templates/11
index 6ff6b10b..c1492b57 100644
--- a/server/tftpboot/menu.lst/templates/11
+++ b/server/tftpboot/menu.lst/templates/11
@@ -1,6 +1,6 @@
-##NO-TOCAR-ESTA-LINEA 1hd-1partition
+##NO-TOCAR-ESTA-LINEA 1hd-1os
 timeout 1
-title FirstHardDisk-FirstPartition
+title FirstDisk-FirstOperatingSystem
 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 0843c3b1..0db966b7 100644
--- a/server/tftpboot/menu.lst/templates/12
+++ b/server/tftpboot/menu.lst/templates/12
@@ -1,6 +1,6 @@
-##NO-TOCAR-ESTA-LINEA 1hd-2partition
+##NO-TOCAR-ESTA-LINEA 1hd-2os
 timeout 1
-title FirstHardDisk-SecondPartition
+title FirstHardDisk-SecondOperatingSystem
 root (hd0,1)
 chainloader (hd0,1)+1
 boot
-- 
cgit v1.2.3-18-g5258