diff options
| -rw-r--r-- | dist-assets/linux/after-install.sh | 4 | ||||
| -rw-r--r-- | dist-assets/linux/before-remove.sh | 1 | ||||
| -rw-r--r-- | gui/packages/desktop/electron-builder.yml | 16 |
3 files changed, 12 insertions, 9 deletions
diff --git a/dist-assets/linux/after-install.sh b/dist-assets/linux/after-install.sh index fa8e808b08..0abe49cbe5 100644 --- a/dist-assets/linux/after-install.sh +++ b/dist-assets/linux/after-install.sh @@ -2,8 +2,10 @@ set -eu if which systemctl &> /dev/null; then - systemctl enable mullvad-daemon.service + 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 diff --git a/dist-assets/linux/before-remove.sh b/dist-assets/linux/before-remove.sh index 829bb25b1e..7ed49f1f78 100644 --- a/dist-assets/linux/before-remove.sh +++ b/dist-assets/linux/before-remove.sh @@ -6,4 +6,5 @@ if which systemctl &> /dev/null; then systemctl disable mullvad-daemon.service elif /sbin/init --version | grep upstart &> /dev/null; then stop mullvad-daemon + rm -f /etc/init/mullvad-daemon.conf fi diff --git a/gui/packages/desktop/electron-builder.yml b/gui/packages/desktop/electron-builder.yml index 229917455d..bc284d638f 100644 --- a/gui/packages/desktop/electron-builder.yml +++ b/gui/packages/desktop/electron-builder.yml @@ -109,22 +109,22 @@ linux: to: . - from: ../../../dist-assets/binaries/linux/openvpn to: . + - from: ../../../dist-assets/linux/mullvad-daemon.conf + to: . + - from: ../../../dist-assets/linux/mullvad-daemon.service + to: . deb: fpm: ["--before-remove", "../../../dist-assets/linux/before-remove.sh", - "--config-files", "/etc/systemd/system/mullvad-daemon.service", - "--config-files", "/etc/init/mullvad-daemon.conf", - "../../../dist-assets/linux/mullvad-daemon.service=/etc/systemd/system/", - "../../../dist-assets/linux/mullvad-daemon.conf=/etc/init/"] + "--config-files", "/opt/Mullvad VPN/resources/mullvad-daemon.service", + "--config-files", "/opt/Mullvad VPN/resources/mullvad-daemon.conf"] afterInstall: ../../../dist-assets/linux/after-install.sh afterRemove: ../../../dist-assets/linux/after-remove.sh rpm: fpm: ["--before-remove", "../../../dist-assets/linux/before-remove.sh", - "--config-files", "/etc/systemd/system/mullvad-daemon.service", - "--config-files", "/etc/init/mullvad-daemon.conf", - "../../../dist-assets/linux/mullvad-daemon.service=/etc/systemd/system/", - "../../../dist-assets/linux/mullvad-daemon.conf=/etc/init/"] + "--config-files", "/opt/Mullvad VPN/resources/mullvad-daemon.service", + "--config-files", "/opt/Mullvad VPN/resources/mullvad-daemon.conf"] afterInstall: ../../../dist-assets/linux/after-install.sh afterRemove: ../../../dist-assets/linux/after-remove.sh depends: |