From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Mon, 10 Sep 2007 04:34:58 +0000 (+0000)
Subject: DEVEL15-windows-wix-20070909
X-Git-Tag: openafs-devel-1_5_25~27
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3d66eb5cb8d54fee407d07d3fea07016c53e0ad8;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-wix-20070909


make the service display name consistent with the NSIS installer.


(cherry picked from commit 36414528add4f7e30147e19ef9777478ca9f60ef)
---

diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index 4aa3eb86b..9abac1db5 100644
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -910,7 +910,7 @@
                     <Component Win64="$(var.Win64)" Id="cmf_afsd_service_EXE" Guid="$(var.cmf_afsd_service_EXE_guid)">
                         <File Id="fileafsd_service_EXE" Name="afsd_svc.exe" LongName="afsd_service.exe" KeyPath="yes" DiskId="1" />
                         <ServiceControl Id="TransarcAFSDaemon" Name="TransarcAFSDaemon" Stop="both" Remove="both" Wait="yes" />
-                        <ServiceInstall Id="svc_Client" Name="TransarcAFSDaemon" DisplayName="OpenAFS Client" Type="ownProcess" Start="auto" ErrorControl="normal" Description="Provides access to files and directories stored in AFS" Interactive="yes">
+                        <ServiceInstall Id="svc_Client" Name="TransarcAFSDaemon" DisplayName="OpenAFS Client Service" Type="ownProcess" Start="auto" ErrorControl="normal" Description="Provides access to files and directories stored in AFS" Interactive="yes">
 							<!-- ServiceConfig doesn't currently do what you think it does.
 							     We instead use a custom action to set the service failure actions.
                             <ServiceConfig FirstFailureActionType="restart" RestartServiceDelayInSeconds="10" SecondFailureActionType="restart" ThirdFailureActionType="none"/>