diff options
| author | Odd Stranne <odd@mullvad.net> | 2019-05-08 10:35:22 +0200 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2019-05-08 10:35:22 +0200 |
| commit | 583f0c493cb5dc103ce28f13bea116bcde7bfa3c (patch) | |
| tree | cc4308c3b3aa93048935ef478157e859c1839820 | |
| parent | 8443607d58e7e3e7be533b92ae76fd4cc54e4c57 (diff) | |
| parent | 7990dde4643aacc99a03646e2d9abff2508fd092 (diff) | |
| download | mullvadvpn-583f0c493cb5dc103ce28f13bea116bcde7bfa3c.tar.xz mullvadvpn-583f0c493cb5dc103ce28f13bea116bcde7bfa3c.zip | |
Merge branch 'remove-unused-wmi'
| -rw-r--r-- | dist-assets/windows/installer.nsh | 9 | ||||
| -rw-r--r-- | mullvad-daemon/src/system_service.rs | 2 | ||||
| m--------- | windows/windows-libraries | 0 |
3 files changed, 8 insertions, 3 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 0021606a36..5e4bb2f53e 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -37,6 +37,9 @@ !define PTI_GENERAL_ERROR 0 !define PTI_SUCCESS 1 +# Windows error codes +!define ERROR_SERVICE_DEPENDENCY_DELETED 1075 + # # BreakInstallation # @@ -314,7 +317,11 @@ ${If} $0 != ${SERVICE_STARTED} ${AndIf} $0 != ${SERVICE_START_PENDING} - StrCpy $R0 "Failed to start Mullvad service: error $0" + ${If} $0 == ${ERROR_SERVICE_DEPENDENCY_DELETED} + StrCpy $R0 'Failed to start Mullvad service: The firewall service "Base Filtering Engine" is missing or unavailable.' + ${Else} + StrCpy $R0 "Failed to start Mullvad service: error $0" + ${EndIf} log::LogWithDetails $R0 $1 Goto InstallService_return ${EndIf} diff --git a/mullvad-daemon/src/system_service.rs b/mullvad-daemon/src/system_service.rs index 61bbb84981..62c997022a 100644 --- a/mullvad-daemon/src/system_service.rs +++ b/mullvad-daemon/src/system_service.rs @@ -245,8 +245,6 @@ fn get_service_info() -> ServiceInfo { dependencies: vec![ // Base Filter Engine ServiceDependency::Service(OsString::from("BFE")), - // Windows Management Instrumentation (WMI) - ServiceDependency::Service(OsString::from("winmgmt")), ], account_name: None, // run as System account_password: None, diff --git a/windows/windows-libraries b/windows/windows-libraries -Subproject d3ba2ac4292f7e5b37e060da1619ed5e07ef63a +Subproject 4811e79d118b454397c8930ad18338e25b29db1 |