diff options
| author | ramon <ramongomez@us.es> | 2011-08-11 11:31:32 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2011-08-11 11:31:32 +0000 |
| commit | 300fbd973d37c7ba9abad2afe31204747abc8f0d (patch) | |
| tree | 0cc6f66136b2742bbe172627a75646e8a68cb82e | |
| parent | b41b30ce0ff36435c002796fe1b536439c43da50 (diff) | |
Versión 1.0.2: cambio de clave correcto en clientes nuevos y antiguos (modifica #433)
git-svn-id: https://opengnsys.es/svn/branches/version1.0@2285 a21b9725-9963-47de-94b9-378ad31fedc9
| -rwxr-xr-x | client/shared/etc/init/default.sh | 2 | ||||
| -rwxr-xr-x | client/shared/etc/preinit/mountrepo.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/shared/etc/init/default.sh b/client/shared/etc/init/default.sh index 39451465..d1fea1c9 100755 --- a/client/shared/etc/init/default.sh +++ b/client/shared/etc/init/default.sh @@ -4,7 +4,7 @@ # Lanzar servicios complementarios del cliente. -PASS=$(grep "^[ ]*OPTIONS=" /scripts/ogfunctions 2>&1 | \ +PASS=$(grep "^[ ]*\(export \)\?OPTIONS=" /scripts/ogfunctions 2>&1 | \ sed 's/\(.*\)pass=\(\w*\)\(.*\)/\2/') PASS=${PASS:-"og"} echo -ne "$PASS\n$PASS\n" | passwd root 2>/dev/null diff --git a/client/shared/etc/preinit/mountrepo.sh b/client/shared/etc/preinit/mountrepo.sh index af11f065..5c20499a 100755 --- a/client/shared/etc/preinit/mountrepo.sh +++ b/client/shared/etc/preinit/mountrepo.sh @@ -20,7 +20,7 @@ if [ $ogactiveadmin == "true" ]; then printf "$MSG_MOUNTREPO\n" "$protocol" "$boot" case "$protocol" in nfs) mount.nfs ${ROOTREPO}:$OGIMG $OGIMG -o rw,nolock ;; - smb) PASS=$(grep "^[ ]*OPTIONS=" /scripts/ogfunctions 2>&1 | \ + smb) PASS=$(grep "^[ ]*\(export \)\?OPTIONS=" /scripts/ogfunctions 2>&1 | \ sed 's/\(.*\)pass=\(\w*\)\(.*\)/\2/') PASS=${PASS:-"og"} mount.cifs //${ROOTREPO}/ogimages $OGIMG -o rw,serverino,acl,username=opengnsys,password=$PASS |