summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathew Robinson <chasinglogic@gmail.com>2020-02-13 15:21:38 -0500
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-02-14 15:12:35 +0000
commitefa43f5170ab702319128770b0347df0bb2bd8b8 (patch)
tree51b0dadc529d2da51820f06d30a24d4b3d6886b9
parent876b3af1091b299884869c34a41f7f37d4dcc0bb (diff)
downloadmongo-efa43f5170ab702319128770b0347df0bb2bd8b8.tar.gz
SERVER-45334 Service Name not respected in MSI Installer
-rw-r--r--src/mongo/installer/msi/wxs/BinaryFragment.wxs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/installer/msi/wxs/BinaryFragment.wxs b/src/mongo/installer/msi/wxs/BinaryFragment.wxs
index 59cf40d951f..720ba44549d 100644
--- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs
+++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs
@@ -17,17 +17,17 @@
<File Id="f_mongodWithService" Name="mongod.exe" Source="$(var.BinarySource)\mongod.exe"
DiskId ="1" KeyPath="yes"/>
<ServiceInstall Id='MyServiceInstall'
- Description="MongoDB Database Server"
+ Description="MongoDB Database Server ([MONGO_SERVICE_NAME])"
Arguments='--config "[BIN]mongod.cfg" --service'
- DisplayName='MongoDB Server'
- Name='MongoDB'
+ DisplayName='MongoDB Server ([MONGO_SERVICE_NAME])'
+ Name='[MONGO_SERVICE_NAME]'
ErrorControl='normal'
Start='auto'
Type='ownProcess'
Account='[MONGO_SERVICE_FULL_ACCOUNT_NAME]'
Password='[MONGO_SERVICE_ACCOUNT_PASSWORD]'
Vital='yes' />
- <ServiceControl Id="StartStopService" Name="MongoDB" Start="install" Stop="both" Remove="uninstall" Wait="no" />
+ <ServiceControl Id="StartStopService" Name="[MONGO_SERVICE_NAME]" Start="install" Stop="both" Remove="uninstall" Wait="no" />
</Component>
<Component Id="c_mongodWithServiceUser" Guid="961B0579-4074-4437-B168-9B6C5E3C9E6A" KeyPath="yes">
<Condition><![CDATA[MONGO_SERVICE_INSTALL AND MONGO_SERVICE_ACCOUNT_TYPE <> "ServiceLocalNetwork"]]></Condition>