diff options
| author | Emīls <emils@mullvad.net> | 2020-09-29 09:30:27 +0100 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2020-09-29 09:30:27 +0100 |
| commit | 09e0229b42515c44bca27c103bafdfd53bacf5ee (patch) | |
| tree | 55a6c92137eeb780552579077014102b37b60e24 | |
| parent | def36201e85df568031306d20b8b8eee8b6577aa (diff) | |
| parent | 7e5f70d599b5feab3aeb70c1333b40cf2a9239f7 (diff) | |
| download | mullvadvpn-09e0229b42515c44bca27c103bafdfd53bacf5ee.tar.xz mullvadvpn-09e0229b42515c44bca27c103bafdfd53bacf5ee.zip | |
Merge branch 'unix-reset-firewall-on-uninstall'
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | dist-assets/linux/before-remove.sh | 2 | ||||
| -rwxr-xr-x | dist-assets/uninstall_macos.sh | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f7379d65c8..3e36272bdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,10 @@ Line wrap the file at 100 chars. Th - Add support for WireGuard's kernel module if it's loaded. - Add tray context menu with actions. - Improve accessibility in the desktop app. +- Reset firewall when uninstalling. + +#### MacOS +- Reset firewall whe uninstalling. ### Changed - Open and focus app when opened from context menu instead of toggling the window. diff --git a/dist-assets/linux/before-remove.sh b/dist-assets/linux/before-remove.sh index ffc27a3bec..401419410b 100644 --- a/dist-assets/linux/before-remove.sh +++ b/dist-assets/linux/before-remove.sh @@ -24,3 +24,5 @@ elif /sbin/init --version | grep upstart &> /dev/null; then stop mullvad-daemon rm -f /etc/init/mullvad-daemon.conf fi + +/opt/Mullvad\ VPN/resources/mullvad-setup reset-firewall || true diff --git a/dist-assets/uninstall_macos.sh b/dist-assets/uninstall_macos.sh index eae0fdc1d2..5beba32652 100755 --- a/dist-assets/uninstall_macos.sh +++ b/dist-assets/uninstall_macos.sh @@ -20,6 +20,9 @@ DAEMON_PLIST_PATH="/Library/LaunchDaemons/net.mullvad.daemon.plist" sudo launchctl unload -w "$DAEMON_PLIST_PATH" sudo rm -f "$DAEMON_PLIST_PATH" +echo "Resetting firewall" +sudo /Applications/Mullvad\ VPN.app/Contents/Resources/mullvad-setup reset-firewall + echo "Removing zsh shell completion symlink ..." sudo rm -f /usr/local/share/zsh/site-functions/_mullvad |