diff options
| author | Evan Anderson <evan@eaanderson.com> | 2022-06-20 22:10:43 -0500 |
|---|---|---|
| committer | Evan Anderson <evan@eaanderson.com> | 2022-06-20 22:11:56 -0500 |
| commit | 0d6dfcdebc12a420274ff7c22500f9b45fbb7fd5 (patch) | |
| tree | 72082b700cb7eeed3b47073c57ec3cf01a79f089 /dist-assets/linux | |
| parent | 845be5b8ea708062f2067aa4d8c205713c0a65ea (diff) | |
| download | mullvadvpn-0d6dfcdebc12a420274ff7c22500f9b45fbb7fd5.tar.xz mullvadvpn-0d6dfcdebc12a420274ff7c22500f9b45fbb7fd5.zip | |
Remove legacy upstart init configuration
The supported platforms (Ubuntu 18.04+, Debian 10+, and Fedora 33+) all use systemd,
so the old upstart configuration can be safely removed
Diffstat (limited to 'dist-assets/linux')
| -rw-r--r-- | dist-assets/linux/after-install.sh | 10 | ||||
| -rw-r--r-- | dist-assets/linux/before-remove.sh | 11 | ||||
| -rw-r--r-- | dist-assets/linux/mullvad-daemon.conf | 6 |
3 files changed, 5 insertions, 22 deletions
diff --git a/dist-assets/linux/after-install.sh b/dist-assets/linux/after-install.sh index b75b72dc31..632a3b6268 100644 --- a/dist-assets/linux/after-install.sh +++ b/dist-assets/linux/after-install.sh @@ -3,11 +3,5 @@ set -eu chmod u+s "/usr/bin/mullvad-exclude" -if which systemctl &> /dev/null; then - systemctl enable "/opt/Mullvad VPN/resources/mullvad-daemon.service" - systemctl start mullvad-daemon.service -elif /sbin/init --version | grep upstart &> /dev/null; then - ln -s "/opt/Mullvad VPN/resources/mullvad-daemon.conf" /etc/init/ - initctl reload-configuration - start mullvad-daemon -fi +systemctl enable "/opt/Mullvad VPN/resources/mullvad-daemon.service" +systemctl start mullvad-daemon.service diff --git a/dist-assets/linux/before-remove.sh b/dist-assets/linux/before-remove.sh index 6d4ec5262f..340cd272cc 100644 --- a/dist-assets/linux/before-remove.sh +++ b/dist-assets/linux/before-remove.sh @@ -14,14 +14,9 @@ if [[ "$1" == "upgrade" ]]; then exit 0; fi -if which systemctl &> /dev/null; then - # the user might've disabled or stopped the service themselves already - systemctl stop mullvad-daemon.service || true - systemctl disable mullvad-daemon.service || true -elif /sbin/init --version | grep upstart &> /dev/null; then - stop mullvad-daemon - rm -f /etc/init/mullvad-daemon.conf -fi +# the user might've disabled or stopped the service themselves already +systemctl stop mullvad-daemon.service || true +systemctl disable mullvad-daemon.service || true pkill -x "mullvad-gui" || true diff --git a/dist-assets/linux/mullvad-daemon.conf b/dist-assets/linux/mullvad-daemon.conf deleted file mode 100644 index 70bb4b624c..0000000000 --- a/dist-assets/linux/mullvad-daemon.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Upstart job configuration file for the Mullvad VPN daemon - -start on local-filesystems and net-device-up IFACE!=lo -respawn -chdir /opt/Mullvad\ VPN/resources -exec /opt/Mullvad\ VPN/resources/mullvad-daemon -v |