diff options
| author | jalonso <jonathan.alonso@uab.es> | 2013-03-21 11:52:28 +0000 |
|---|---|---|
| committer | jalonso <jonathan.alonso@uab.es> | 2013-03-21 11:52:28 +0000 |
| commit | 3037c80efcfdaf7703bd3f0a04314a557da6e645 (patch) | |
| tree | 7683cc57e5dfbef053fc966ca06f9c2c68ab5e74 /client/shared/scripts/configureOs | |
| parent | d177da736d7fa2221753e0607f402ac2035177f7 (diff) | |
#578 Resubida de cambios para arreglar la instalacion del cliente de windows. Ahora funciona como una funcion dependiente de ogInstallMiniSetup y no como una funcion autonoma.
git-svn-id: https://opengnsys.es/svn/branches/version1.0@3708 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/shared/scripts/configureOs')
| -rwxr-xr-x | client/shared/scripts/configureOs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/client/shared/scripts/configureOs b/client/shared/scripts/configureOs index cedb8dd9..06423564 100755 --- a/client/shared/scripts/configureOs +++ b/client/shared/scripts/configureOs @@ -58,17 +58,12 @@ case "$OSTYPE" in ogWindowsRegisterPartition $1 $2 C $1 $2 ogLoadHiveWindows $1 $2; ogSetWindowsChkdisk $OGWINCHKDISK; ogUpdateHiveWindows # Instalar cliente para Windows. -<<<<<<< .mine ogInstallMiniSetup $1 $2 postconf.cmd ogInstallWindowsClient $1 $2 postconf.cmd -======= - ogInstallMiniSetup $1 $2 postconf.cmd - ogInstallWindowsClient $1 $2 postconf.cmd ->>>>>>> .r3706 ;; Linux) ## Install and Configure Grub based on OS installed and Grub 1st stage location. - ogGrubInstallPartition $1 $2 FALSE + ogGrubInstallPartition $1 $2 # Instalar cliente para Linux. ogInstallLinuxClient $1 $2 ;; |