From: Asanka Herath <asanka@secure-endpoints.com>
Date: Mon, 18 Dec 2006 22:34:24 +0000 (+0000)
Subject: DEVEL15-windows-install-wix-20061218
X-Git-Tag: openafs-devel-1_5_13~23
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f440509af26992ccd1ea96acaac9e2f0ae03019b;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-install-wix-20061218


remove the AFS Server wizard shortcut

add AFS Server dependencies (tcpip and PNP_TDI)


(cherry picked from commit a1c31b6637fe44f2a2ebd4be491b71cc4e0fa922)
---

diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index a24566ff3..155ecef73 100644
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -1001,7 +1001,9 @@
                             </Component>
                              <Component Win64="$(var.Win64)" Id="cmf_afssvrcfg_EXE" Guid="$(var.cmf_afssvrcfg_EXE_guid)">
                                 <File Id="fileafssvrcfg_EXE" Name="afssv.exe" LongName="afssvrcfg.exe" KeyPath="yes" DiskId="1">
+<!--
 									<Shortcut Id="scSvrCfgWizard" Directory="dirShortCut" Name="SvrCfgWz.lnk" LongName="Server Configuration Wizard.lnk" Description="$(loc.StrCfgWzdDesc)" Arguments="/wizard" Icon="ico_afssvrcfg" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
+-->
                                 </File>
                             </Component>
 			    <?if $(env.CPU) = "i386"?>
@@ -1016,6 +1018,8 @@
 									<!-- ServiceConfig does nothing 
                                     <ServiceConfig FirstFailureActionType="restart" RestartServiceDelayInSeconds="5" SecondFailureActionType="restart" ThirdFailureActionType="none"/>
                                     -->
+                                    <ServiceDependency Id="Tcpip" />
+                                    <ServiceDependency Id="PNP_TDI" Group="yes"/>
                                 </ServiceInstall>
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_bosserver_EXE" Guid="$(var.cmf_bosserver_EXE_guid)">