diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-11-12 14:02:22 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-11-12 14:02:22 +0100 |
| commit | b812e60459e17993881bb8ab886b4b6ff30b73db (patch) | |
| tree | b66d854e80b1c87cd9416b072a2841442a79418a /mullvad-daemon | |
| parent | 3e73ef4143463c7924a3ea607e998cf4d99ff75f (diff) | |
| parent | 54a2e3ccc9f9c1b278050b37acf72005eb659f69 (diff) | |
| download | mullvadvpn-b812e60459e17993881bb8ab886b4b6ff30b73db.tar.xz mullvadvpn-b812e60459e17993881bb8ab886b4b6ff30b73db.zip | |
Merge branch 'update-windows-service-crate'
Diffstat (limited to 'mullvad-daemon')
| -rw-r--r-- | mullvad-daemon/Cargo.toml | 2 | ||||
| -rw-r--r-- | mullvad-daemon/src/system_service.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml index 18d5c3f207..406c48f09b 100644 --- a/mullvad-daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -47,7 +47,7 @@ simple-signal = "1.1" [target.'cfg(windows)'.dependencies] ctrlc = "3.0" -windows-service = { git = "https://github.com/mullvad/windows-service-rs.git", rev = "55c5dfb372e6b3f5607a3159c5388d27b6b84ff6" } +windows-service = { git = "https://github.com/mullvad/windows-service-rs.git", rev = "da48aacfce712969437a756230b9aa8213ff6fba" } winapi = "0.3" [target.'cfg(windows)'.build-dependencies] diff --git a/mullvad-daemon/src/system_service.rs b/mullvad-daemon/src/system_service.rs index 57e4cba00c..d98fcfaaeb 100644 --- a/mullvad-daemon/src/system_service.rs +++ b/mullvad-daemon/src/system_service.rs @@ -24,7 +24,7 @@ use mullvad_daemon::DaemonShutdownHandle; static SERVICE_NAME: &'static str = "MullvadVPN"; static SERVICE_DISPLAY_NAME: &'static str = "Mullvad VPN Service"; -static SERVICE_TYPE: ServiceType = ServiceType::OwnProcess; +static SERVICE_TYPE: ServiceType = ServiceType::OWN_PROCESS; pub fn run() -> Result<()> { // Start the service dispatcher. |