diff options
| author | ramon <ramongomez@us.es> | 2011-03-28 12:24:04 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2011-03-28 12:24:04 +0000 |
| commit | 16919efaa7abc641db49592795a6476bd36ac988 (patch) | |
| tree | c6f02284051aad7303f9262386ee3f42c28acc2c /client | |
| parent | a7125bfb2ca911a2a13d0b33d3a2edc45691e7e5 (diff) | |
Version 1.0: Creación de imágenes desde la consola en cliente no administrador.
* Corrección en funciones {{{ogGetRepoIp}}} y {{{ogGetServerIp}}}.
* Corrección de errata en script de interfaz web para cambiar modo de montaje del repositorio.
* Modificación de permisos de instalación.
Modificado #291.
git-svn-id: https://opengnsys.es/svn/branches/version1.0@1642 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client')
| -rwxr-xr-x | client/engine/Net.lib | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/client/engine/Net.lib b/client/engine/Net.lib index f1f1422c..6ac5a94a 100755 --- a/client/engine/Net.lib +++ b/client/engine/Net.lib @@ -112,14 +112,12 @@ echo ${MAC%% *} function ogGetRepoIp () { # Obtener direcciones IP, segun el protocolo de montaje -case $ogprotocol in - nfs) - [ -n "$OGIMG" ] && mount | grep " $OGIMG .* nfs " | cut -f1 -d: - ;; - smb) - [ -n "$OGIMG" ] && mount | grep ogimages | awk -F"addr=" '{print $2}' | cut -f1 -d"," - ;; -esac +if [ -n "$OGIMG" ]; then + case "$ogprotocol" in + nfs) mount | grep " on $OGIMG " | cut -f1 -d: ;; + smb) mount | grep " on $OGIMG " | cut -f3 -d/ ;; + esac +fi } @@ -138,14 +136,11 @@ esac function ogGetServerIp () { # Obtener direcciones IP. -case $ogprotocol in - nfs) - [ -n "$OPENGNSYS" ] && mount | grep " $OPENGNSYS .* nfs " | cut -f1 -d: - ;; - smb) - [ -n "$OGIMG" ] && mount | grep ogclient | awk -F"addr=" '{print $2}' | cut -f1 -d"," - ;; -esac +if [ -n "$PENGNSYS" ]; then + case "$ogprotocol" in + nfs) mount | grep " on $OPENGNSYS " | cut -f1 -d: ;; + smb) mount | grep " on $OPENGNSYS " | cut -f3 -d/ ;; + esac +fi } - |