From 98d9d6cf83904d1422a96bb0646f560646d62114 Mon Sep 17 00:00:00 2001 From: Asanka Herath Date: Tue, 20 Apr 2010 15:06:41 -0400 Subject: [PATCH] Windows: Show configuration pages for all types of MSI installations The OpenAFS MSI installer wizard used to not show any configuration pages for "Typical" and "Complete" installations. Setting the workstation cell and logon options during installation required selecting the "Custom" option. Many users choose the "Typical" option during installation, and thus would never see the configuration pages. Therefore, for these users, the workstation cell was being set to the default. This patch makes the workstation cell and logon option configuration pages visible to all types of installations (except silent installations which show no UI). Change-Id: Ie3bc040607a8d6b636c884bfcb919d0fc69b0e06 Reviewed-on: http://gerrit.openafs.org/1797 Reviewed-by: Derrick Brashear Tested-by: Jeffrey Altman Reviewed-by: Jeffrey Altman --- src/WINNT/install/wix/lang/en_US/ui.wxi | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/WINNT/install/wix/lang/en_US/ui.wxi b/src/WINNT/install/wix/lang/en_US/ui.wxi index 1b18559abd..f3b11abb3a 100644 --- a/src/WINNT/install/wix/lang/en_US/ui.wxi +++ b/src/WINNT/install/wix/lang/en_US/ui.wxi @@ -1,4 +1,4 @@ - + DlgFont8 @@ -683,7 +683,7 @@ 1 1 - 1 + 1 [DlgTitleFont]C&ustom @@ -698,7 +698,7 @@ 1 1 - 1 + 1 ShowUserRegistrationDlg <> 1 AND NOT (IBMAFS_UPGRADE OR OPENAFS_UPGRADE) @@ -731,7 +731,8 @@ - 1 + InstallMode <> "Typical" AND InstallMode <> "Complete" + InstallMode = "Typical" OR InstallMode = "Complete" 1 @@ -872,7 +873,7 @@ (InstallMode = "Custom" OR InstallMode = "Change") AND &feaClient <> 3 (InstallMode = "Custom" OR InstallMode = "Change") AND &feaClient = 3 InstallMode = "Repair" - InstallMode = "Typical" OR InstallMode = "Complete" + InstallMode = "Typical" OR InstallMode = "Complete" The [Wizard] is ready to begin the [InstallMode] installation