From 523c8aceb9fee82274e630090f9a37db797c42e0 Mon Sep 17 00:00:00 2001 From: ramon Date: Wed, 6 Jun 2012 09:33:53 +0000 Subject: [PATCH] =?UTF-8?q?Versi=C3=B3n=201.0.4,=20#516=20#518:=20Asistent?= =?UTF-8?q?e=20de=20particionado=20reinicia=20el=20cliente=20tras=20realiz?= =?UTF-8?q?ar=20la=20operaci=C3=B3n.=20Peque=C3=B1a=20correcci=C3=B3n=20en?= =?UTF-8?q?=20la=20BD.?= 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@3147 a21b9725-9963-47de-94b9-378ad31fedc9 --- admin/Database/ogAdmBD-1.0-1.0.4pre.sql | 2 +- admin/Database/ogAdmBD-1.0.1-1.0.4pre.sql | 2 +- admin/Database/ogAdmBD-1.0.2-1.0.4pre.sql | 2 +- admin/Database/ogAdmBD-1.0.2a-1.0.4pre.sql | 2 +- admin/Database/ogAdmBD-1.0.3-1.0.4pre.sql | 2 +- .../asistentes/jscripts/asistentes.js | 184 ++++++++---------- 6 files changed, 81 insertions(+), 113 deletions(-) diff --git a/admin/Database/ogAdmBD-1.0-1.0.4pre.sql b/admin/Database/ogAdmBD-1.0-1.0.4pre.sql index 260bc1a5..1f9f8773 100644 --- a/admin/Database/ogAdmBD-1.0-1.0.4pre.sql +++ b/admin/Database/ogAdmBD-1.0-1.0.4pre.sql @@ -9,7 +9,7 @@ ALTER TABLE ogAdmBD.perfileshard ADD winboot enum( 'reboot', 'kexec' ) NOT NULL ALTER TABLE ogAdmBD.ordenadores_particiones MODIFY codpar int(8) NOT NULL, - ADD numdisk tinyint(4) NOT NULL DEFAULT 1, + ADD numdisk tinyint(4) NOT NULL DEFAULT 1 AFTER idordenador, ADD cache varchar(500), DROP INDEX idordenadornumpar, ADD UNIQUE idordenadornumdisknumpar(idordenador,numdisk,numpar); diff --git a/admin/Database/ogAdmBD-1.0.1-1.0.4pre.sql b/admin/Database/ogAdmBD-1.0.1-1.0.4pre.sql index 260bc1a5..1f9f8773 100644 --- a/admin/Database/ogAdmBD-1.0.1-1.0.4pre.sql +++ b/admin/Database/ogAdmBD-1.0.1-1.0.4pre.sql @@ -9,7 +9,7 @@ ALTER TABLE ogAdmBD.perfileshard ADD winboot enum( 'reboot', 'kexec' ) NOT NULL ALTER TABLE ogAdmBD.ordenadores_particiones MODIFY codpar int(8) NOT NULL, - ADD numdisk tinyint(4) NOT NULL DEFAULT 1, + ADD numdisk tinyint(4) NOT NULL DEFAULT 1 AFTER idordenador, ADD cache varchar(500), DROP INDEX idordenadornumpar, ADD UNIQUE idordenadornumdisknumpar(idordenador,numdisk,numpar); diff --git a/admin/Database/ogAdmBD-1.0.2-1.0.4pre.sql b/admin/Database/ogAdmBD-1.0.2-1.0.4pre.sql index 29d67d99..d42c3bb4 100644 --- a/admin/Database/ogAdmBD-1.0.2-1.0.4pre.sql +++ b/admin/Database/ogAdmBD-1.0.2-1.0.4pre.sql @@ -11,7 +11,7 @@ ALTER TABLE ogAdmBD.perfileshard ADD winboot enum( 'reboot', 'kexec' ) NOT NULL ALTER TABLE ogAdmBD.ordenadores_particiones MODIFY codpar int(8) NOT NULL, - ADD numdisk tinyint(4) NOT NULL DEFAULT 1, + ADD numdisk tinyint(4) NOT NULL DEFAULT 1 AFTER idordenador, ADD cache varchar(500), DROP INDEX idordenadornumpar, ADD UNIQUE idordenadornumdisknumpar(idordenador,numdisk,numpar); diff --git a/admin/Database/ogAdmBD-1.0.2a-1.0.4pre.sql b/admin/Database/ogAdmBD-1.0.2a-1.0.4pre.sql index 09f51de1..aa0dfacf 100644 --- a/admin/Database/ogAdmBD-1.0.2a-1.0.4pre.sql +++ b/admin/Database/ogAdmBD-1.0.2a-1.0.4pre.sql @@ -7,7 +7,7 @@ ALTER TABLE ogAdmBD.perfileshard ADD winboot enum( 'reboot', 'kexec' ) NOT NULL ALTER TABLE ogAdmBD.ordenadores_particiones MODIFY codpar int(8) NOT NULL, - ADD numdisk tinyint(4) NOT NULL DEFAULT 1, + ADD numdisk tinyint(4) NOT NULL DEFAULT 1 AFTER idordenador, ADD cache varchar(500), DROP INDEX idordenadornumpar, ADD UNIQUE idordenadornumdisknumpar(idordenador,numdisk,numpar); diff --git a/admin/Database/ogAdmBD-1.0.3-1.0.4pre.sql b/admin/Database/ogAdmBD-1.0.3-1.0.4pre.sql index e0ea8318..efabaec5 100644 --- a/admin/Database/ogAdmBD-1.0.3-1.0.4pre.sql +++ b/admin/Database/ogAdmBD-1.0.3-1.0.4pre.sql @@ -5,7 +5,7 @@ ALTER TABLE ogAdmBD.perfileshard ADD winboot enum( 'reboot', 'kexec' ) NOT NULL # Soportar particiones GPT y añadir información de caché. ALTER TABLE ogAdmBD.ordenadores_particiones MODIFY codpar int(8) NOT NULL, - ADD numdisk tinyint(4) NOT NULL DEFAULT 1, + ADD numdisk tinyint(4) NOT NULL DEFAULT 1 AFTER idordenador, ADD cache varchar(500), DROP INDEX idordenadornumpar, ADD UNIQUE idordenadornumdisknumpar(idordenador,numdisk,numpar); diff --git a/admin/WebConsole/asistentes/jscripts/asistentes.js b/admin/WebConsole/asistentes/jscripts/asistentes.js index ce4d0830..36aadc3d 100644 --- a/admin/WebConsole/asistentes/jscripts/asistentes.js +++ b/admin/WebConsole/asistentes/jscripts/asistentes.js @@ -112,36 +112,33 @@ function codeParticionadoMSDOS (form) { } if (form.check4.checked) { if (form.size4.value == "0") { - //cacheCode = " ogUnmountCache \n ogUnmountAll 1 \n sizecache=`ogGetPartitionSize 1 4` \n ogDeletePartitionTable 1 \n ogUpdatePartitionTable 1 \n initCache $sizecache "; cacheCode="\ - echo \"[20] $MSG_HELP_ogGetPartitionSize CACHE\" | tee -a $OGLOGSESSION \n \ - sizecache=`ogGetPartitionSize 1 4` \n \ - echo \"[30] $MSG_HELP_ogDeletePartitionTable - $MSG_HELP_ogUpdatePartitionTable 1\" | tee -a $OGLOGSESSION \n \ - ogDeletePartitionTable "+n_disk+" \n \ - ogUpdatePartitionTable "+n_disk+" | tee -a $OGLOGCOMMAND \n \ - echo \"[50] $MSG_HELP_ogCreateCache \" | tee -a $OGLOGSESSION \n \ - initCache $sizecache &>/dev/null | tee -a $OGLOGCOMMAND \n "; +echo \"[20] $MSG_HELP_ogGetPartitionSize CACHE\" | tee -a $OGLOGSESSION \n \ +sizecache=`ogGetPartitionSize 1 4` \n \ +echo \"[30] $MSG_HELP_ogDeletePartitionTable - $MSG_HELP_ogUpdatePartitionTable 1\" | tee -a $OGLOGSESSION \n \ +ogDeletePartitionTable "+n_disk+" \n \ +ogUpdatePartitionTable "+n_disk+" | tee -a $OGLOGCOMMAND \n \ +echo \"[50] $MSG_HELP_ogCreateCache \" | tee -a $OGLOGSESSION \n \ +initCache $sizecache &>/dev/null | tee -a $OGLOGCOMMAND \n "; } else { if (form.size4.value == "CUSTOM") { cacheSize = form.size4custom.value; } else { cacheSize = form.size4.value; } - //cacheCode = " ogUnmountCache \n ogUnmountAll 1 \n ogDeletePartitionTable 1 \n ogUpdatePartitionTable 1 \n initCache " + cacheSize; cacheCode="\ - echo \"[30] $MSG_HELP_ogDeletePartitionTable - $MSG_HELP_ogUpdatePartitionTable 1\" | tee -a $OGLOGSESSION \n \ - ogDeletePartitionTable "+n_disk+" \n \ - ogUpdatePartitionTable "+n_disk+" \n \ - echo \"[50] $MSG_HELP_ogCreateCache \" | tee -a $OGLOGSESSION \n \ - initCache " + cacheSize + " &>/dev/null | tee -a $OGLOGCOMMAND"; +echo \"[30] $MSG_HELP_ogDeletePartitionTable - $MSG_HELP_ogUpdatePartitionTable 1\" | tee -a $OGLOGSESSION \n \ +ogDeletePartitionTable "+n_disk+" \n \ +ogUpdatePartitionTable "+n_disk+" \n \ +echo \"[50] $MSG_HELP_ogCreateCache \" | tee -a $OGLOGSESSION \n \ +initCache " + cacheSize + " &>/dev/null | tee -a $OGLOGCOMMAND"; } } else { - //cacheCode = " ogUnmountCache \n ogUnmountAll 1 \n ogDeletePartitionTable 1 \n ogUpdatePartitionTable 1 "; cacheCode="\ - echo \"[30] $MSG_HELP_ogDeletePartitionTable - $MSG_HELP_ogUpdatePartitionTable 1\" | tee -a $OGLOGSESSION \n \ - ogDeletePartitionTable "+n_disk+" \n \ - ogUpdatePartitionTable "+n_disk+" \n"; - partCode += " EMPTY:0"; +echo \"[30] $MSG_HELP_ogDeletePartitionTable - $MSG_HELP_ogUpdatePartitionTable 1\" | tee -a $OGLOGSESSION \n \ +ogDeletePartitionTable "+n_disk+" \n \ +ogUpdatePartitionTable "+n_disk+" \n"; +partCode += " EMPTY:0"; } if (extended) { var lastLogical=5; @@ -175,14 +172,7 @@ function codeParticionadoMSDOS (form) { partCode += logicalCode; } -// form.codigo.value="\ -//" + cacheCode + " \n \ -//ogListPartitions 1 \n \ -//ogCreatePartitions 1 " + partCode + " \n \ -//ogSetPartitionActive 1 1 \n \ -//ogUpdatePartitionTable 1 \n \ -//ogListPartitions 1 \n"; -form.codigo.value="\ + form.codigo.value="\ ogCreatePartitionTable "+n_disk+" "+tipo_part_table +" \n \ echo \"[0] $MSG_HELP_ogCreatePartitions \" | tee -a $OGLOGSESSION $OGLOGFILE \n \ echo \"[10] $MSG_HELP_ogUnmountAll "+n_disk+"\" | tee -a $OGLOGSESSION \n \ @@ -198,10 +188,11 @@ ogSetPartitionActive "+n_disk+" 1 \n \ echo \"[100] $MSG_HELP_ogListPartitions "+n_disk+"\" | tee -a $OGLOGSESSION $OGLOGFILE \n \ ogUpdatePartitionTable "+n_disk+" \n \ ms-sys /dev/sda | grep unknow && ms-sys /dev/sda \n \ -ogListPartitions "+n_disk+" | tee -a $OGLOGCOMMAND $OGLOGSESSION $OGLOGFILE \n"; - +ogListPartitions "+n_disk+" | tee -a $OGLOGCOMMAND $OGLOGSESSION $OGLOGFILE \ +reboot \n"; } + function codeParticionadoGPT (form) { var partCode=""; var logicalCode=""; @@ -215,77 +206,59 @@ function codeParticionadoGPT (form) { for (var nPart=1; nPart <= numParts; nPart++) { var partCheck=eval("form.checkGPT"+nPart); if (partCheck.checked) { - // Distinguimos entre cache y el resto de particiones - if(nPart == 4){ - if (form.sizeGPT4.value == "0") { - //cacheCode = " ogUnmountCache \n ogUnmountAll 1 \n sizecache=`ogGetPartitionSize 1 4` \n ogDeletePartitionTable 1 \n ogUpdatePartitionTable 1 \n initCache $sizecache "; - cacheCode="\ - echo \"[20] $MSG_HELP_ogGetPartitionSize CACHE\" | tee -a $OGLOGSESSION \n \ - sizecache=`ogGetPartitionSize 1 4` \n \ - echo \"[30] $MSG_HELP_ogDeletePartitionTable - $MSG_HELP_ogUpdatePartitionTable 1\" | tee -a $OGLOGSESSION \n \ - ogDeletePartitionTable "+n_disk+" \n \ - ogUpdatePartitionTable "+n_disk+" | tee -a $OGLOGCOMMAND \n \ - echo \"[50] $MSG_HELP_ogCreateCache \" | tee -a $OGLOGSESSION \n \ - initCache $sizecache &>/dev/null | tee -a $OGLOGCOMMAND \n "; - } else { - if (form.sizeGPT4.value == "CUSTOM") { - cacheSize = form.sizeGPT4custom.value; - } else { - cacheSize = form.sizeGPT4.value; - } - //cacheCode = " ogUnmountCache \n ogUnmountAll 1 \n ogDeletePartitionTable 1 \n ogUpdatePartitionTable 1 \n initCache " + cacheSize; - cacheCode="\ - echo \"[30] $MSG_HELP_ogDeletePartitionTable - $MSG_HELP_ogUpdatePartitionTable 1\" | tee -a $OGLOGSESSION \n \ - ogDeletePartitionTable "+n_disk+" \n \ - ogUpdatePartitionTable "+n_disk+" \n \ - echo \"[50] $MSG_HELP_ogCreateCache \" | tee -a $OGLOGSESSION \n \ - initCache " + cacheSize + " &>/dev/null | tee -a $OGLOGCOMMAND"; - } - } - else{ - var partType=eval("form.partGPT"+nPart); - if (partType.value == "CUSTOM" ) { - var partTypeCustom=eval("form.partGPT"+nPart+"custom"); - partCode += " " + partTypeCustom.value; - if (partTypeCustom.value == "EXTENDED") { - extended=true; - } - } else { - partCode += " " + partType.value; - if (partType.value == "EXTENDED") { - extended=true; - } - } - var partSize=eval("form.sizeGPT"+nPart); - if (partSize.value == "CUSTOM" ) { - var partSizeCustom=eval("form.sizeGPT"+nPart+"custom"); - partCode += ":" + partSizeCustom.value; - } else { - partCode += ":" + partSize.value; - } - } + // Distinguimos entre cache y el resto de particiones + if(nPart == 4) { + if (form.sizeGPT4.value == "0") { + cacheCode="\ +echo \"[20] $MSG_HELP_ogGetPartitionSize CACHE\" | tee -a $OGLOGSESSION \n \ +sizecache=`ogGetPartitionSize 1 4` \n \ +echo \"[30] $MSG_HELP_ogDeletePartitionTable - $MSG_HELP_ogUpdatePartitionTable 1\" | tee -a $OGLOGSESSION \n \ +ogDeletePartitionTable "+n_disk+" \n \ +ogUpdatePartitionTable "+n_disk+" | tee -a $OGLOGCOMMAND \n \ +echo \"[50] $MSG_HELP_ogCreateCache \" | tee -a $OGLOGSESSION \n \ +initCache $sizecache &>/dev/null | tee -a $OGLOGCOMMAND \n "; + } else { + if (form.sizeGPT4.value == "CUSTOM") { + cacheSize = form.sizeGPT4custom.value; + } else { + cacheSize = form.sizeGPT4.value; + } + cacheCode="\ +echo \"[30] $MSG_HELP_ogDeletePartitionTable - $MSG_HELP_ogUpdatePartitionTable 1\" | tee -a $OGLOGSESSION \n \ +ogDeletePartitionTable "+n_disk+" \n \ +ogUpdatePartitionTable "+n_disk+" \n \ +echo \"[50] $MSG_HELP_ogCreateCache \" | tee -a $OGLOGSESSION \n \ +initCache " + cacheSize + " &>/dev/null | tee -a $OGLOGCOMMAND"; + } + } else{ + var partType=eval("form.partGPT"+nPart); + if (partType.value == "CUSTOM" ) { + var partTypeCustom=eval("form.partGPT"+nPart+"custom"); + partCode += " " + partTypeCustom.value; + } else { + partCode += " " + partType.value; + } + var partSize=eval("form.sizeGPT"+nPart); + if (partSize.value == "CUSTOM" ) { + var partSizeCustom=eval("form.sizeGPT"+nPart+"custom"); + partCode += ":" + partSizeCustom.value; + } else { + partCode += ":" + partSize.value; + } + } } else { - if(nPart == 4){ - //cacheCode = " ogUnmountCache \n ogUnmountAll 1 \n ogDeletePartitionTable 1 \n ogUpdatePartitionTable 1 "; - cacheCode="\ - echo \"[30] $MSG_HELP_ogDeletePartitionTable - $MSG_HELP_ogUpdatePartitionTable 1\" | tee -a $OGLOGSESSION \n \ - ogDeletePartitionTable "+n_disk+" \n \ - ogUpdatePartitionTable "+n_disk+" \n"; - partCode += " EMPTY:0"; - } - else{ - partCode += " EMPTY:0"; - } + if(nPart == 4){ + cacheCode="\ +echo \"[30] $MSG_HELP_ogDeletePartitionTable - $MSG_HELP_ogUpdatePartitionTable 1\" | tee -a $OGLOGSESSION \n \ +ogDeletePartitionTable "+n_disk+" \n \ +ogUpdatePartitionTable "+n_disk+" \n"; +partCode += " EMPTY:0"; + } else{ + partCode += " EMPTY:0"; + } } } -// form.codigo.value="\ -//" + cacheCode + " \n \ -//ogListPartitions 1 \n \ -//ogCreatePartitions 1 " + partCode + " \n \ -//ogSetPartitionActive 1 1 \n \ -//ogUpdatePartitionTable 1 \n \ -//ogListPartitions 1 \n"; -form.codigo.value="\ + form.codigo.value="\ ogCreatePartitionTable "+n_disk+" "+tipo_part_table +" \n \ echo \"[0] $MSG_HELP_ogCreatePartitions \" | tee -a $OGLOGSESSION $OGLOGFILE \n \ echo \"[10] $MSG_HELP_ogUnmountAll "+n_disk+"\" | tee -a $OGLOGSESSION \n \ @@ -301,34 +274,29 @@ ogSetPartitionActive "+n_disk+" 1 \n \ echo \"[100] $MSG_HELP_ogListPartitions "+n_disk+"\" | tee -a $OGLOGSESSION $OGLOGFILE \n \ ogUpdatePartitionTable "+n_disk+" \n \ ms-sys /dev/sda | grep unknow && ms-sys /dev/sda \n \ -ogListPartitions "+n_disk+" | tee -a $OGLOGCOMMAND $OGLOGSESSION $OGLOGFILE \n"; - +ogListPartitions "+n_disk+" | tee -a $OGLOGCOMMAND $OGLOGSESSION $OGLOGFILE \ +reboot \n"; } - - -function showPartitionForm(tipo_table_part){ +function showPartitionForm (tipo_table_part) { document.getElementById("form"+tipo_table_part).style.display="inline"; if(tipo_table_part == "MSDOS"){ // De los dos tipos, se oculta el otro document.getElementById("formGPT").style.display="none"; - - } - else{ + } else{ document.getElementById("formMSDOS").style.display="none"; } } // Código de pulsación de selección de partición. -function clickPartitionCheckbox(form, npart, isGPT) { +function clickPartitionCheckbox (form, npart, isGPT) { // Si el parametro no esta definido, se toma como false isGPT = (isGPT)?isGPT:"false"; if(isGPT == true){ prefix="GPT"; - } - else{ + } else { prefix=""; } var partCheck=eval("form.check"+prefix+npart);