From 35f55cbad0b108b7dfe01bcd7ebed10386c9f7ea Mon Sep 17 00:00:00 2001
From: albertogp <albertogp@uma.es>
Date: Wed, 27 Feb 2013 10:30:02 +0000
Subject: #534 integración mejora en rama de desarrollo   branch/version1.0 
 (1.0.5pre) DESACTIVANDO LA FUNCION DE ESTE TICKET HASTA REVISION
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://opengnsys.es/svn/branches/version1.0@3647 a21b9725-9963-47de-94b9-378ad31fedc9
---
 server/tftpboot/menu.lst/templates/01         |  8 --------
 server/tftpboot/menu.lst/templates/1          |  9 +++++++++
 server/tftpboot/menu.lst/templates/11         |  1 +
 server/tftpboot/menu.lst/templates/12         |  1 +
 server/tftpboot/menu.lst/templates/19pxeADMIN | 12 ------------
 server/tftpboot/menu.lst/templates/pxe        |  1 +
 server/tftpboot/menu.lst/templates/pxeADMIN   | 13 +++++++++++++
 7 files changed, 25 insertions(+), 20 deletions(-)
 delete mode 100644 server/tftpboot/menu.lst/templates/01
 create mode 100644 server/tftpboot/menu.lst/templates/1
 delete mode 100644 server/tftpboot/menu.lst/templates/19pxeADMIN
 create mode 100644 server/tftpboot/menu.lst/templates/pxeADMIN

(limited to 'server/tftpboot')

diff --git a/server/tftpboot/menu.lst/templates/01 b/server/tftpboot/menu.lst/templates/01
deleted file mode 100644
index 9fa2316b..00000000
--- a/server/tftpboot/menu.lst/templates/01
+++ /dev/null
@@ -1,8 +0,0 @@
-timeout 1
-title  MBR
-keeppxe
-chainloader (hd0)+1
-rootnoverify (hd0) 
-boot
-
-
diff --git a/server/tftpboot/menu.lst/templates/1 b/server/tftpboot/menu.lst/templates/1
new file mode 100644
index 00000000..1b52bb54
--- /dev/null
+++ b/server/tftpboot/menu.lst/templates/1
@@ -0,0 +1,9 @@
+##NO-TOCAR-ESTA-LINEA MBR
+timeout 1
+title  MBR
+keeppxe
+chainloader (hd0)+1
+rootnoverify (hd0) 
+boot
+
+
diff --git a/server/tftpboot/menu.lst/templates/11 b/server/tftpboot/menu.lst/templates/11
index 00560c00..92be0dca 100644
--- a/server/tftpboot/menu.lst/templates/11
+++ b/server/tftpboot/menu.lst/templates/11
@@ -1,3 +1,4 @@
+##NO-TOCAR-ESTA-LINEA 1hd-1partition
 timeout 1
 title FirstHardDisk-FirstPartition
 keeppxe
diff --git a/server/tftpboot/menu.lst/templates/12 b/server/tftpboot/menu.lst/templates/12
index 2fb0dfcb..6f46c742 100644
--- a/server/tftpboot/menu.lst/templates/12
+++ b/server/tftpboot/menu.lst/templates/12
@@ -1,3 +1,4 @@
+##NO-TOCAR-ESTA-LINEA 1hd-2partition
 timeout 1
 title FirstHardDisk-SecondPartition
 keeppxe
diff --git a/server/tftpboot/menu.lst/templates/19pxeADMIN b/server/tftpboot/menu.lst/templates/19pxeADMIN
deleted file mode 100644
index cf58dabf..00000000
--- a/server/tftpboot/menu.lst/templates/19pxeADMIN
+++ /dev/null
@@ -1,12 +0,0 @@
-default saved
-timeout 1
-hiddenmenu
-fallback 1 2 3
-
-
-title OpenGnSys-NET
-keeppxe
-kernel (pd)/ogclient/ogvmlinuz  ro boot=oginit vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=true ogdebug=true ogupdateinitrd=true INFOHOST 
-initrd (pd)/ogclient/oginitrd.img
-boot
-
diff --git a/server/tftpboot/menu.lst/templates/pxe b/server/tftpboot/menu.lst/templates/pxe
index 29687f0e..6abbed39 100644
--- a/server/tftpboot/menu.lst/templates/pxe
+++ b/server/tftpboot/menu.lst/templates/pxe
@@ -1,3 +1,4 @@
+##NO-TOCAR-ESTA-LINEA ogClient
 default saved
 timeout 1
 hiddenmenu
diff --git a/server/tftpboot/menu.lst/templates/pxeADMIN b/server/tftpboot/menu.lst/templates/pxeADMIN
new file mode 100644
index 00000000..f9f3246f
--- /dev/null
+++ b/server/tftpboot/menu.lst/templates/pxeADMIN
@@ -0,0 +1,13 @@
+##NO-TOCAR-ESTA-LINEA ogAdmin
+default saved
+timeout 1
+hiddenmenu
+fallback 1 2 3
+
+
+title OpenGnSys-NET
+keeppxe
+kernel (pd)/ogclient/ogvmlinuz  ro boot=oginit vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=true ogdebug=true ogupdateinitrd=true INFOHOST 
+initrd (pd)/ogclient/oginitrd.img
+boot
+
-- 
cgit v1.2.3-18-g5258