summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2021-11-30 16:26:38 +0100
committerDavid Lönnhager <david.l@mullvad.net>2021-11-30 16:26:38 +0100
commit0ed0865e1419d8e509e8f8d093e06df88fed3f01 (patch)
tree5e780f6802f85bfd2d5b284fd8e09d7a89df0b3f
parent7ae92aaad1acf92573cb3b16de37b31ac70e06f0 (diff)
parent63b8e0676ae4242d16e91dc6d0ee1e2ab38ad91c (diff)
downloadmullvadvpn-0ed0865e1419d8e509e8f8d093e06df88fed3f01.tar.xz
mullvadvpn-0ed0865e1419d8e509e8f8d093e06df88fed3f01.zip
Merge branch 'linux-uninstall-kill-gui'
-rw-r--r--dist-assets/linux/before-remove.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/dist-assets/linux/before-remove.sh b/dist-assets/linux/before-remove.sh
index 0871efab1e..602d3d09fc 100644
--- a/dist-assets/linux/before-remove.sh
+++ b/dist-assets/linux/before-remove.sh
@@ -23,5 +23,7 @@ elif /sbin/init --version | grep upstart &> /dev/null; then
rm -f /etc/init/mullvad-daemon.conf
fi
+pkill -x "mullvad-gui" || true
+
/opt/Mullvad\ VPN/resources/mullvad-setup reset-firewall || echo "Failed to reset firewall"
/opt/Mullvad\ VPN/resources/mullvad-setup remove-wireguard-key || echo "Failed to remove leftover WireGuard key"