diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-04-02 15:00:35 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-04-02 15:00:35 +0000 |
commit | 858467baecab512ec354775cd1c8cd268b683e15 (patch) | |
tree | 975cd3da43ba9b0525556300ad87821fdf8a5c67 /javainstaller2 | |
parent | 54d495363634297ae2a9325799f353e45db942b3 (diff) |
INTEGRATION: CWS native135 (1.4.6); FILE MERGED
2008/03/04 14:54:18 is 1.4.6.1: #i79534# installation in sparse zones with root privileges
Diffstat (limited to 'javainstaller2')
-rwxr-xr-x | javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java index 6507245a9048..357d1730c828 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java @@ -4,9 +4,9 @@ * * $RCSfile: PrologueCtrl.java,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: ihi $ $Date: 2008-02-05 13:37:02 $ + * last change: $Author: kz $ $Date: 2008-04-02 16:00:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -69,7 +69,7 @@ public class PrologueCtrl extends PanelController { Controller.checkPackagePathExistence(installData); Controller.checkPackageFormat(installData); - if ( installData.getOSType().equalsIgnoreCase("SunOS") ) { + if (( installData.getOSType().equalsIgnoreCase("SunOS") ) && ( installData.isMultiLingual() )) { Controller.collectSystemLanguages(installData); } @@ -103,6 +103,18 @@ public class PrologueCtrl extends PanelController { } } + if (( installData.isRootInstallation() ) && ( installData.getOSType().equalsIgnoreCase("SunOS") )) { + // Check, if root has write access in /usr and /etc . + // In sparse zones with imported directories this is not always the case. + if ( Controller.reducedRootWritePrivileges() ) { + ModuleCtrl.setIgnoreNonRelocatablePackages(packageData); + } + + if ( installData.logModuleStates() ) { + Dumper.logModuleStates(packageData, "after setIgnoreNonRelocatablePackages"); + } + } + if ( installData.isRootInstallation() ) { Controller.checkForNewerVersion(installData); } |