diff options
| author | ramon <ramongomez@us.es> | 2011-04-05 14:39:26 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2011-04-05 14:39:26 +0000 |
| commit | 2af97381a271428e72ab95b9f52618bb7439d361 (patch) | |
| tree | 54461c98c20ad6ed78e49c8defc28d8a5dce56e9 | |
| parent | 1222e988c047463b2863ec1eb0f755d8b652f1cf (diff) | |
Version 1.0: Eliminar mensajes de error redundantes en función {{{ogMountFs}}}.
git-svn-id: https://opengnsys.es/svn/branches/version1.0@1703 a21b9725-9963-47de-94b9-378ad31fedc9
| -rwxr-xr-x | client/engine/FileSystem.lib | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/client/engine/FileSystem.lib b/client/engine/FileSystem.lib index 61fa9092..17391e19 100755 --- a/client/engine/FileSystem.lib +++ b/client/engine/FileSystem.lib @@ -353,7 +353,7 @@ fi # Obtener partición. PART="$(ogDiskToDev $1 $2)" || return $? -echo $(mount | awk -v P=$PART '{if ($1==P) {print $3}}') +mount | awk -v P=$PART '{if ($1==P) {print $3}}' } @@ -571,12 +571,14 @@ if [ -z "$MNTDIR" ]; then return $OG_ERR_PARTITION ;; esac - $MOUNT $PARAMS $PART $MNTDIR || $MOUNT $PARAMS $PART $MNTDIR -o force,remove_hiberfile || ogRaiseError $OG_ERR_PARTITION "$1, $2, $TYPE" || return $? - # linea temporal durante desarrollo para poder usar el cliente completo nfs y testeas nuevas herramientas. + $MOUNT $PARAMS $PART $MNTDIR 2>/dev/null || \ + $MOUNT $PARAMS $PART $MNTDIR -o force,remove_hiberfile 2>/dev/null || \ + ogRaiseError $OG_ERR_PARTITION "$1, $2, $TYPE" || return $? + # linea temporal durante desarrollo para poder usar el cliente completo nfs y testeas nuevas herramientas. if grep -q nfsroot /proc/cmdline; then - echo "$PART $MNTDIR" >> /etc/mtab - fi - # fin linea temporal. + echo "$PART $MNTDIR" >> /etc/mtab + fi + # fin linea temporal. fi echo $MNTDIR } |