diff options
author | ramon <ramongomez@us.es> | 2011-10-21 11:18:56 +0000 |
---|---|---|
committer | ramon <ramongomez@us.es> | 2011-10-21 11:18:56 +0000 |
commit | 95ca83a4df8b5ab5bb44ba4226789870180c1db7 (patch) | |
tree | 9151bad82a513ef66d5bf5dcb4b9207f827c762e /client/engine/PostConfEAC.lib | |
parent | 8971cdf63e1139844750f5ac0213de76ce56936a (diff) |
Versión 1.0.2: independizar mayúsculas/minúsculas en acceso a fichero de las funciones de post-configuración de Windows (modifica #439 y #436).
git-svn-id: https://opengnsys.es/svn/branches/version1.0@2357 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/engine/PostConfEAC.lib')
-rwxr-xr-x | client/engine/PostConfEAC.lib | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/client/engine/PostConfEAC.lib b/client/engine/PostConfEAC.lib index fe78e1a9..9bdaf795 100755 --- a/client/engine/PostConfEAC.lib +++ b/client/engine/PostConfEAC.lib @@ -590,21 +590,25 @@ schroot -end-sessiona --all-sessions #@author Jonathan Alonso Martinez - Universidad Autonoma de Barcelona #@date 2011-06-29 #*/ ## -function ogInstallMiniSetup () { - +function ogInstallMiniSetup () +{ +local CMDDIR CMDFILE # Si se solicita, mostrar ayuda. if [ "$*" == "help" ]; then ogHelp "$FUNCNAME" "$FUNCNAME path_mountpoint str_filename" \ "$FUNCNAME /mnt/sda1 filename.cmd" return -fi - +fi # Error si no se reciben 2 parámetros. [ $# == 2 ] || return $(ogRaiseError $OG_ERR_FORMAT; echo $?) +# Comprobar que existe el directorio del fichero de comandos. +CMDDIR=$(ogGetPath "$1/windows/system32") +[ -n "$CMDDIR" ] || ogReiseError OG_NOTFOUND "$1/windows/system32" || return $? +CMDFILE="$CMDDIR/$2" # Creamos el archivo cmd y creamos un par de comandos para que una vez acabe la # postconfiguracion resetee el mini setup, sino lo haria en cada arranque. -cat > $1/Windows/System32/$2 << EOF +cat > "$CMDFILE" << EOF REG ADD HKLM\System\Setup /v SystemSetupInProgress /t REG_DWORD /d 0 /f REG ADD HKLM\System\Setup /v CmdLine /t REG_SZ /d "" /f EOF @@ -629,19 +633,22 @@ ogSetRegistryValue "$1" SYSTEM "\Setup\CmdLine" "cmd.exe /c $2" #@date 2011-06-29 #*/ ## -function ogAddCmd() { - +function ogAddCmd () +{ +local CMDFILE # Si se solicita, mostrar ayuda. if [ "$*" == "help" ]; then ogHelp "$FUNCNAME" "$FUNCNAME path_mountpoint str_filename str_commands" \ "$FUNCNAME /mnt/sda1 filename.cmd command" return -fi - +fi # Error si no se reciben 3 parámetros. [ $# == 3 ] || return $(ogRaiseError $OG_ERR_FORMAT; echo $?) +# Comprobar que existe el fichero de comandos. +CMDFILE=$(ogGetPath "$1/windows/system32/$2") +[ -n "$CMDFILE" ] || ogReiseError OG_NOTFOUND "$1/windows/system32/$2" || return $? -cat >> $1/Windows/System32/$2 << EOF +cat >> "$CMDFILE" << EOF $3 EOF } @@ -660,17 +667,20 @@ EOF #@date 2011-06-29 #*/ ## -function ogDomainScript() { - +function ogDomainScript () +{ +local CMDDIR # Si se solicita, mostrar ayuda. if [ "$*" == "help" ]; then ogHelp "$FUNCNAME" "$FUNCNAME path_mountpoint str_filename str_domain str_user str_password" \ "$FUNCNAME /mnt/sda1 filename.cmd domain user password_user" return -fi - +fi # Error si no se reciben 4 parámetros. [ $# == 5 ] || return $(ogRaiseError $OG_ERR_FORMAT; echo $?) +# Comprobar que existe el directorio de comandos. +CMDDIR=$(ogGetPath "$1/windows/system32") +[ -n "$CMDDIR" ] || ogReiseError OG_NOTFOUND "$1/windows/system32" || return $? # Añadimos en el cmd que se ejecutara al arranque, el comando de ejecutar el script que añade al dominio. ogAddCmd $1 "$2" "CSCRIPT joindomain.vbs" @@ -678,7 +688,7 @@ ogAddCmd $1 "$2" "CSCRIPT joindomain.vbs" ogAddCmd $1 "$2" "del /Q C:\Windows\System32\joindomain.vbs" # Creamos el archivo joindomain.vbs que nos introduce la maquina en el dominio -cat > $1/Windows/System32/joindomain.vbs << EOF +cat > "$CMDDIR/joindomain.vbs" << EOF Const JOIN_DOMAIN = 1 Const ACCT_CREATE = 2 Const ACCT_DELETE = 4 @@ -703,3 +713,4 @@ ReturnValue = objComputer.JoinDomainOrWorkGroup(strDomain, strPassword, _ strDomain & "\" & strUser, NULL, JOIN_DOMAIN + ACCT_CREATE) EOF } + |