diff options
| author | Ingo Schmidt <is@openoffice.org> | 2010-02-09 15:53:45 +0100 |
|---|---|---|
| committer | Ingo Schmidt <is@openoffice.org> | 2010-02-09 15:53:45 +0100 |
| commit | 34ae5460d644b74005e395edfa538680e1980701 (patch) | |
| tree | 7a304649cae026e8a515035e14e77203bbc1592b /javainstaller2/src | |
| parent | 14a6186576146ba795e663fd44be45fd60404c93 (diff) | |
native0 #161619# preparations for o5office
Diffstat (limited to 'javainstaller2/src')
| -rwxr-xr-x | javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java index ccc1e7bf11df..ad3460159262 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java @@ -120,8 +120,8 @@ public class SolarisHelper { String mailLine = "mail="; adminFile.add(mailLine); - String conflictLine = "conflict=quit"; - if ( data.isUserInstallation() ) { conflictLine = "conflict=nocheck"; } + String conflictLine = "conflict=nochange"; + if ( data.isUserInstallation() ) { conflictLine = "conflict=nochange"; } adminFile.add(conflictLine); String runlevelLine = "runlevel=nocheck"; |