summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2022-06-21 11:38:20 +0200
committerLinus Färnstrand <linus@mullvad.net>2022-06-21 11:38:20 +0200
commitb6b80b9ffe6521a78ea6b2cdfd0e6965e67479fd (patch)
tree90d4be034cf24e196a89a60ae2636bf3f7b9d174 /gui
parent845be5b8ea708062f2067aa4d8c205713c0a65ea (diff)
parent6e3ee60b42d2de6353880da93c3d319c9218a3f2 (diff)
downloadmullvadvpn-b6b80b9ffe6521a78ea6b2cdfd0e6965e67479fd.tar.xz
mullvadvpn-b6b80b9ffe6521a78ea6b2cdfd0e6965e67479fd.zip
Merge remote-tracking branch 'evan-a-a/remove_upstart'
Diffstat (limited to 'gui')
-rw-r--r--gui/tasks/distribution.js5
1 files changed, 0 insertions, 5 deletions
diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js
index dc9968dcb6..87a07d3c96 100644
--- a/gui/tasks/distribution.js
+++ b/gui/tasks/distribution.js
@@ -155,7 +155,6 @@ const config = {
{ from: distAssets('mullvad-setup'), to: '.' },
{ from: distAssets('libtalpid_openvpn_plugin.so'), to: '.' },
{ from: distAssets('binaries/x86_64-unknown-linux-gnu/openvpn'), to: '.' },
- { from: distAssets('linux/mullvad-daemon.conf'), to: '.' },
{ from: distAssets('linux/mullvad-daemon.service'), to: '.' },
],
},
@@ -171,8 +170,6 @@ const config = {
distAssets('linux/before-remove.sh'),
'--config-files',
'/opt/Mullvad VPN/resources/mullvad-daemon.service',
- '--config-files',
- '/opt/Mullvad VPN/resources/mullvad-daemon.conf',
distAssets('mullvad') + '=/usr/bin/',
distAssets('mullvad-exclude') + '=/usr/bin/',
distAssets('linux/problem-report-link') + '=/usr/bin/mullvad-problem-report',
@@ -196,8 +193,6 @@ const config = {
distAssets('linux/post-transaction.sh'),
'--config-files',
'/opt/Mullvad VPN/resources/mullvad-daemon.service',
- '--config-files',
- '/opt/Mullvad VPN/resources/mullvad-daemon.conf',
distAssets('mullvad') + '=/usr/bin/',
distAssets('mullvad-exclude') + '=/usr/bin/',
distAssets('linux/problem-report-link') + '=/usr/bin/mullvad-problem-report',