diff options
| author | Mathew Robinson <chasinglogic@gmail.com> | 2020-02-13 15:21:38 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-04-07 19:53:39 +0000 |
| commit | 39ccf5361de7bc60722ef98193c416c73d0229be (patch) | |
| tree | 3e7c8aa54e0ed5e9eb33403f4d5527808e2f5817 | |
| parent | 95626d0eca8325488d354221b1ec5b1019743fa1 (diff) | |
| download | mongo-39ccf5361de7bc60722ef98193c416c73d0229be.tar.gz | |
SERVER-45334 Service Name not respected in MSI Installer
(cherry picked from commit efa43f5170ab702319128770b0347df0bb2bd8b8)
(cherry picked from commit e0882dfe0354ac5076296196c15221fef2618cfe)
| -rw-r--r-- | src/mongo/installer/msi/wxs/BinaryFragment.wxs | 8 |
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 b4b80c0e9ce..3ccb89a17ab 100644 --- a/src/mongo/installer/msi/wxs/BinaryFragment.wxs +++ b/src/mongo/installer/msi/wxs/BinaryFragment.wxs @@ -21,17 +21,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>
|