From e4fffba32413fd35a4c2c43e92a42470909ad952 Mon Sep 17 00:00:00 2001 From: albertogp Date: Mon, 3 May 2021 17:30:57 +0200 Subject: #824 Cambiando a bootOs --- .../comandos/gestores/gestor_Comandos.php | 467 +-------------------- client/shared/scripts/deployImage | 2 +- installer/opengnsys_installer.sh | 4 +- installer/opengnsys_update.sh | 8 +- 4 files changed, 10 insertions(+), 471 deletions(-) diff --git a/admin/WebConsole/comandos/gestores/gestor_Comandos.php b/admin/WebConsole/comandos/gestores/gestor_Comandos.php index 47c199a4..f8df18b6 100644 --- a/admin/WebConsole/comandos/gestores/gestor_Comandos.php +++ b/admin/WebConsole/comandos/gestores/gestor_Comandos.php @@ -205,7 +205,7 @@ if($sw_ejya=='on'){ Creacion del fichero .sh para cambiar la columna de arranque --------------------------------------------------------------------------------------------------------------------*/ $ipsh=$cadenaipsh[$x]; - $ficherosh = "/opt/opengnsys/log/clients/setBootMode/InSisRes.".$ipsh; + $ficherosh = "/opt/opengnsys/log/clients/bootOs/InSisRes.".$ipsh; $ficherolanza=fopen($ficherosh,"w"); fwrite($ficherolanza,"#!/bin/bash @@ -222,7 +222,7 @@ if($sw_ejya=='on'){ sleep 2 # Borramos el fichero - rm /opt/opengnsys/log/setBootMode/InSisRes.$ipsh + rm /opt/opengnsys/log/bootOs/InSisRes.$ipsh # Iniciamos el Sistema sleep 2 @@ -230,474 +230,13 @@ if($sw_ejya=='on'){ "); fclose($ficherolanza); - exec("chmod 777 /opt/opengnsys/log/clients/setBootMode/InSisRes.".$ipsh.""); + exec("chmod 777 /opt/opengnsys/log/clients/bootOs/InSisRes.".$ipsh.""); } } } ################################################################### ///////////////////// agp /////////////////////////////////////// ################################################################### - - -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> f3f00f104cb9aaf0331fab5d6adcb63e1ecc6f6b ->>>>>>> 257195ea1832ef68486f94bc9255e10b9cf8a15e -################################################################### -///////////////////// agp /////////////////////////////////////// -################################################################### -if($sw_ejya=='on'){ - if( ($sw_ejsis == "0") && ($idcomando == "3" || $idcomando == "18") ){ - - // Buscamos el Numero de Disco - $disco=explode(chr(13),$atributos); - $disco=$disco[0]; - $disco=explode("=",$disco); - $disco=$disco[1]; - - // ========================================= - // Buscamos el Numero de Particion - $particion=explode(chr(13),$atributos); - $particion=$particion[1]; - $particion=explode("=",$particion); - $particion=$particion[1]; - - // ========================================= - // Asignamos el arranque - $insisresdisk=$disco." ".$particion; - - $cadenaipsh=explode(";",$filtro); - for ($x=0;$x>>>>>> 257195ea1832ef68486f94bc9255e10b9cf8a15e -################################################################### -///////////////////// agp /////////////////////////////////////// -################################################################### -if($sw_ejya=='on'){ - if( ($sw_ejsis == "0") && ($idcomando == "3" || $idcomando == "18") ){ - - // Buscamos el Numero de Disco - $disco=explode(chr(13),$atributos); - $disco=$disco[0]; - $disco=explode("=",$disco); - $disco=$disco[1]; - - // ========================================= - // Buscamos el Numero de Particion - $particion=explode(chr(13),$atributos); - $particion=$particion[1]; - $particion=explode("=",$particion); - $particion=$particion[1]; - - // ========================================= - // Asignamos el arranque - $insisresdisk=$disco." ".$particion; - - $cadenaipsh=explode(";",$filtro); - for ($x=0;$x>>>>>> ad404a75612b5101f72cafb6ab2a1b62bf7b9d5e ->>>>>>> f3f00f104cb9aaf0331fab5d6adcb63e1ecc6f6b ->>>>>>> 257195ea1832ef68486f94bc9255e10b9cf8a15e /*-------------------------------------------------------------------------------------------------------------------- Creación de parametros para sentencias SQL --------------------------------------------------------------------------------------------------------------------*/ diff --git a/client/shared/scripts/deployImage b/client/shared/scripts/deployImage index db82539a..a28f1a73 100755 --- a/client/shared/scripts/deployImage +++ b/client/shared/scripts/deployImage @@ -213,7 +213,7 @@ fi RETVAL=$? # Marca de Iniciar Sistema Restaurado -InSisRes="/opt/opengnsys/log/setBootMode/InSisRes."$(ogGetIpAddress) +InSisRes="/opt/opengnsys/log/bootOs/InSisRes."$(ogGetIpAddress) # Mostrar resultados. RESUMERESTOREIMAGE=$(grep -m 1 "Total Time:" $OGLOGCOMMAND) diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index 406feb0f..3a893521 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -1245,8 +1245,8 @@ function createDirs() mkdir -p $path_opengnsys_base/etc mkdir -p $path_opengnsys_base/lib mkdir -p $path_opengnsys_base/log/clients - mkdir -p $path_opengnsys_base/log/clients/setBootMode - chmod 777 $path_opengnsys_base/log/clients/setBootMode + mkdir -p $path_opengnsys_base/log/clients/bootOs + chmod 777 $path_opengnsys_base/log/clients/bootOs ln -fs $path_opengnsys_base/log /var/log/opengnsys mkdir -p $path_opengnsys_base/sbin mkdir -p $path_opengnsys_base/www diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh index 2378a8b4..963d9540 100755 --- a/installer/opengnsys_update.sh +++ b/installer/opengnsys_update.sh @@ -841,11 +841,11 @@ function createDirs() mkdir -p ${INSTALL_TARGET}/{bin,doc,etc,lib,sbin,www} mkdir -p ${INSTALL_TARGET}/{client,images/groups} mkdir -p ${INSTALL_TARGET}/log/clients - if [ ! -d ${INSTALL_TARGET}/log/clients/setBootMode ]; then - mkdir -p ${INSTALL_TARGET}/log/clients/setBootMode - chmod 777 ${INSTALL_TARGET}/log/clients/setBootMode + if [ ! -d ${INSTALL_TARGET}/log/clients/bootOs ]; then + mkdir -p ${INSTALL_TARGET}/log/clients/bootOs + chmod 777 ${INSTALL_TARGET}/log/clients/bootOs else - chmod 777 ${INSTALL_TARGET}/log/clients/setBootMode + chmod 777 ${INSTALL_TARGET}/log/clients/bootOs fi ln -fs ${INSTALL_TARGET}/log /var/log/opengnsys # Detectar directorio de instalación de TFTP. -- cgit v1.2.3-18-g5258