diff options
| author | adv <adv@uma.es> | 2018-01-21 21:34:48 +0000 |
|---|---|---|
| committer | adv <adv@uma.es> | 2018-01-21 21:34:48 +0000 |
| commit | 9b89a15c79a66848844050b8e77fbb42142f67ab (patch) | |
| tree | 55434dcd7e860b5ef209023146d26b6af73fd964 /admin/WebConsole/includes | |
| parent | 59cebeed6d0edc6283ca0da41fc70a6d1c3b26ef (diff) | |
#828 configurador PXE incluye identificador del perfil hardware y se elimina el winboot
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5573 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'admin/WebConsole/includes')
| -rw-r--r-- | admin/WebConsole/includes/tftputils.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/admin/WebConsole/includes/tftputils.php b/admin/WebConsole/includes/tftputils.php index 1fb930cd..37aa4596 100644 --- a/admin/WebConsole/includes/tftputils.php +++ b/admin/WebConsole/includes/tftputils.php @@ -63,6 +63,9 @@ function clientKernelVersion () { * @version 1.1.0 - La segunda fase de carga del ogLive se define en el SERVER para evitar erores de sincronismo entre versiones (ticket #787). * @author Antonio J. Doblas Viso - Universidad de Malaga * @date 2017-06-01 + * @version 1.1.0 - Se incluye el nombre del perfil hardware y se elimina el winboot (ticket #828). + * @author Antonio J. Doblas Viso - Universidad de Malaga + * @date 2018-01-21 */ function createBootMode ($cmd, $bootopt, $hostid, $lang) { @@ -83,7 +86,7 @@ function createBootMode ($cmd, $bootopt, $hostid, $lang) { aulas.ntp AS ntp, aulas.dns AS dns, aulas.proxy AS proxy, aulas.nombreaula AS grupo, repositorios.ip AS iprepo, (SELECT ipserveradm FROM entornos LIMIT 1) AS ipserveradm, - menus.resolucion AS vga, perfileshard.winboot AS winboot, + menus.resolucion AS vga, perfileshard.descripcion AS hardprofile, centros.directorio, entidades.ogunit FROM ordenadores JOIN aulas USING (idaula) @@ -111,7 +114,7 @@ function createBootMode ($cmd, $bootopt, $hostid, $lang) { $repo=$rs->campos["iprepo"]; $server=$rs->campos["ipserveradm"]; $vga=$rs->campos["vga"]; - $winboot=$rs->campos["winboot"]; + $hardprofile=$rs->campos["hardprofile"]; $oglivedir=$rs->campos["oglivedir"]; $ogunit=$rs->campos["ogunit"]; if ($ogunit == 0 or $rs->campos["directorio"] == null) { @@ -148,7 +151,7 @@ function createBootMode ($cmd, $bootopt, $hostid, $lang) { if (! empty ($ntp)) { $infohost.=" ogntp=$ntp"; } if (! empty ($dns)) { $infohost.=" ogdns=$dns"; } if (! empty ($proxy)) { $infohost.=" ogproxy=$proxy"; } - if (! empty ($winboot)) { $infohost.=" winboot=$winboot"; } + if (! empty ($hardprofile)) { $infohost.=" hardprofile=$hardprofile"; } // Comprobar si se usa el parámetro "vga" (número de 3 cifras) o "video" (cadena). if (! empty ($vga)) { // UHU - Se sustituye la función is_int por is_numeric, ya que al ser un string no funciona bien con is_int |