diff options
| author | ramon <ramongomez@us.es> | 2017-09-15 10:44:43 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2017-09-15 10:44:43 +0000 |
| commit | 552a6aefda7bd70c67412c5ff989f07e3005b8b3 (patch) | |
| tree | d30d51c3c24acf30c5bf49343d2e4793f8c9fca3 /admin/WebConsole/asistentes | |
| parent | 140fbd56b704afff730e8d7ae51eca8694fb2e95 (diff) | |
#767: Informar de error y parar si falla la función {{{ogCreatePartitions}}} en el asistente de particionado para tabla MSDOS.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5423 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'admin/WebConsole/asistentes')
| -rw-r--r-- | admin/WebConsole/asistentes/jscripts/asistentes.js | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/admin/WebConsole/asistentes/jscripts/asistentes.js b/admin/WebConsole/asistentes/jscripts/asistentes.js index 058f6f94..cbdfa144 100644 --- a/admin/WebConsole/asistentes/jscripts/asistentes.js +++ b/admin/WebConsole/asistentes/jscripts/asistentes.js @@ -247,8 +247,6 @@ partCode += " EMPTY:0"; form.codigo.value="\ " + sizecacheCode + " \n \ -ogCreatePartitionTable "+n_disk+" "+tipo_part_table +" \n \ -ogEcho log session \"[0] $MSG_HELP_ogCreatePartitions \"\n \ ogEcho session \"[10] $MSG_HELP_ogUnmountAll "+n_disk+"\"\n \ ogUnmountAll "+n_disk+" 2>/dev/null\n \ ogUnmountCache \n \ @@ -256,13 +254,17 @@ ogUnmountCache \n \ ogEcho session \"[60] $MSG_HELP_ogListPartitions "+n_disk+"\"\n \ ogExecAndLog command session ogListPartitions "+n_disk+" \n \ ogEcho session \"[70] $MSG_HELP_ogCreatePartitions " + partCode + "\"\n \ -ogExecAndLog command ogCreatePartitions "+n_disk+" " + partCode + " \n \ -ogEcho session \"[80] $MSG_HELP_ogSetPartitionActive "+n_disk+" 1\"\n \ -ogSetPartitionActive "+n_disk+" 1 \n \ -ogEcho log session \"[100] $MSG_HELP_ogListPartitions "+n_disk+"\"\n \ -ogUpdatePartitionTable "+n_disk+" \n \ -ms-sys /dev/sda | grep unknow && ms-sys /dev/sda \n \ -ogExecAndLog command session log ogListPartitions "+n_disk+" \n"; +if ogExecAndLog command session ogCreatePartitions "+n_disk+" " + partCode + "; then \n \ + ogEcho session \"[80] $MSG_HELP_ogSetPartitionActive "+n_disk+" 1\"\n \ + ogSetPartitionActive "+n_disk+" 1 \n \ + ogEcho log session \"[100] $MSG_HELP_ogListPartitions "+n_disk+"\"\n \ + ogUpdatePartitionTable "+n_disk+" \n \ + ms-sys /dev/sda | grep unknow && ms-sys /dev/sda \n \ + ogExecAndLog command session log ogListPartitions "+n_disk+" \n \ +else \n \ + ogEcho session log \"[100] ERROR: $MSG_HELP_ogCreatePartitions \n \ + sleep 5 \n \ +fi"; } |