summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authoradv <adv@uma.es>2017-06-02 09:48:50 +0000
committeradv <adv@uma.es>2017-06-02 09:48:50 +0000
commit2e538275a4ab51ba5c760b5ab1b5410f0ab139a3 (patch)
tree93466e3e4f24eadffefe3ebcddf7325861d00d71 /server
parent2da1991c7f4e0a67c06191c14828dc04fabcd5e5 (diff)
#768 Actualiza las plantillas de pxe para el soporte de arranque de ogLive especificos. Si no existe el indicado utilizará el ogLive por defecto (que está garantizada siempre su existentencia). Se renombra las planillas para dejar de usar ogclient y utilizar ogLive
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5335 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'server')
-rw-r--r--server/tftpboot/menu.lst/templates/19pxeADMIN15
-rw-r--r--server/tftpboot/menu.lst/templates/pxe24
2 files changed, 29 insertions, 10 deletions
diff --git a/server/tftpboot/menu.lst/templates/19pxeADMIN b/server/tftpboot/menu.lst/templates/19pxeADMIN
index 4f43dd17..b5e88179 100644
--- a/server/tftpboot/menu.lst/templates/19pxeADMIN
+++ b/server/tftpboot/menu.lst/templates/19pxeADMIN
@@ -1,12 +1,21 @@
-##NO-TOCAR-ESTA-LINEA ogAdmin
+##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 INFOHOST
+initrd (pd)/%ISODIR%/ogvmlinuz
+savedefault fallback
+boot
+
+
title OpenGnsys-NET
-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
+kernel (pd)/ogLive/ogvmlinuz ro boot=oginit vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=true ogdebug=true ogupdateinitrd=true INFOHOST
+initrd (pd)/ogLive/oginitrd.img
boot
diff --git a/server/tftpboot/menu.lst/templates/pxe b/server/tftpboot/menu.lst/templates/pxe
index ce474e10..2560ef98 100644
--- a/server/tftpboot/menu.lst/templates/pxe
+++ b/server/tftpboot/menu.lst/templates/pxe
@@ -1,8 +1,11 @@
-##NO-TOCAR-ESTA-LINEA ogClient
+##NO-TOCAR-ESTA-LINEA ogLive
default saved
timeout 1
hiddenmenu
-fallback 1 2 3
+fallback 1 2 3 4
+
+set ISODIR=ogLive
+
title firsboot
find --set-root --ignore-floppies --ignore-cd /ogboot.me
@@ -21,17 +24,24 @@ savedefault fallback
boot
title OpenGnsys-CACHE
-find --set-root --ignore-floppies --ignore-cd /boot/ogclient/ogvmlinuz
-kernel /boot/ogclient/ogvmlinuz ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=false ogdebug=false ogupdateinitrd=true INFOHOST
-initrd /boot/ogclient/oginitrd.img
+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 INFOHOST
+initrd /boot/%ISODIR%/oginitrd.img
savedefault fallback
boot
title OpenGnsys-NET
-kernel (pd)/ogclient/ogvmlinuz ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=false ogdebug=false INFOHOST
-initrd (pd)/ogclient/oginitrd.img
+kernel (pd)/%ISODIR%/ogvmlinuz ro boot=oginit quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=false ogdebug=false INFOHOST
+initrd (pd)/%ISODIR%/ogvmlinuz
+savedefault fallback
boot
+title OpenGnsys-NET default
+kernel (pd)/ogLive/ogvmlinuz ro boot=oginit oglivedir=ogLive quiet splash vga=788 irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogactiveadmin=false ogdebug=false INFOHOST
+initrd (pd)/ogLive/oginitrd.img
+boot
+
+