diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-03-09 12:47:04 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-03-17 12:27:40 +0100 |
| commit | ca53d0aeaa6dd9c27d032b2f44c0d835bb442122 (patch) | |
| tree | b85e895c12460a408c80afbcf66edc1ce0fca24e | |
| parent | 184e8d783c67cbf6c2216198c2876990720d9ec2 (diff) | |
| download | mullvadvpn-ca53d0aeaa6dd9c27d032b2f44c0d835bb442122.tar.xz mullvadvpn-ca53d0aeaa6dd9c27d032b2f44c0d835bb442122.zip | |
Block while upgrading on Linux
| -rwxr-xr-x | build.sh | 1 | ||||
| -rw-r--r-- | dist-assets/linux/before-install.sh | 1 | ||||
| -rw-r--r-- | gui/tasks/distribution.js | 1 |
3 files changed, 3 insertions, 0 deletions
@@ -153,6 +153,7 @@ elif [[ ("$(uname -s)" == "Linux") ]]; then mullvad mullvad-problem-report libtalpid_openvpn_plugin.so + mullvad-setup ) elif [[ ("$(uname -s)" == "MINGW"*) ]]; then binaries=( diff --git a/dist-assets/linux/before-install.sh b/dist-assets/linux/before-install.sh index 71fe8ae5ab..b47c6ce24c 100644 --- a/dist-assets/linux/before-install.sh +++ b/dist-assets/linux/before-install.sh @@ -3,6 +3,7 @@ set -eu if which systemctl &> /dev/null; then if systemctl status mullvad-daemon &> /dev/null; then + /opt/Mullvad\ VPN/resources/mullvad-setup prepare-restart systemctl stop mullvad-daemon.service systemctl disable mullvad-daemon.service fi diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js index 20a6dba119..e371e26fbe 100644 --- a/gui/tasks/distribution.js +++ b/gui/tasks/distribution.js @@ -105,6 +105,7 @@ const config = { extraResources: [ { from: distAssets('mullvad-problem-report'), to: '.' }, { from: distAssets('mullvad-daemon'), to: '.' }, + { from: distAssets('mullvad-setup'), to: '.' }, { from: distAssets('libtalpid_openvpn_plugin.so'), to: '.' }, { from: distAssets('binaries/x86_64-unknown-linux-gnu/openvpn'), to: '.' }, { from: distAssets('binaries/x86_64-unknown-linux-gnu/sslocal'), to: '.' }, |