summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2022-09-02 10:56:54 +0200
committerEmīls Piņķis <emils@mullvad.net>2022-09-12 17:29:29 +0200
commit9be68db2506f6e5fe28f58acc2495ab8bd3b67d5 (patch)
tree375750681e9b3b1a325e12a70f66286c34d26741 /gui
parent9598d2efd327fb95d810ce64519f2474b5a7cb46 (diff)
downloadmullvadvpn-9be68db2506f6e5fe28f58acc2495ab8bd3b67d5.tar.xz
mullvadvpn-9be68db2506f6e5fe28f58acc2495ab8bd3b67d5.zip
Add early-boot-blocking unit file
Diffstat (limited to 'gui')
-rw-r--r--gui/tasks/distribution.js16
1 files changed, 12 insertions, 4 deletions
diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js
index 75e0f246cc..45b9ce851b 100644
--- a/gui/tasks/distribution.js
+++ b/gui/tasks/distribution.js
@@ -171,11 +171,9 @@ const config = {
extraFiles: [{ from: distAssets('linux/mullvad-gui-launcher.sh'), to: '.' }],
extraResources: [
{ from: distAssets(path.join(getLinuxTargetSubdir(), 'mullvad-problem-report')), to: '.' },
- { from: distAssets(path.join(getLinuxTargetSubdir(), 'mullvad-daemon')), to: '.' },
{ from: distAssets(path.join(getLinuxTargetSubdir(), 'mullvad-setup')), to: '.' },
{ from: distAssets(path.join(getLinuxTargetSubdir(), 'libtalpid_openvpn_plugin.so')), to: '.' },
{ from: distAssets(path.join('binaries', '${env.TARGET_TRIPLE}', 'openvpn')), to: '.' },
- { from: distAssets('linux/mullvad-daemon.service'), to: '.' },
],
},
@@ -189,8 +187,13 @@ const config = {
'--before-remove',
distAssets('linux/before-remove.sh'),
'--config-files',
- '/opt/Mullvad VPN/resources/mullvad-daemon.service',
+ '/etc/systemd/system/mullvad-daemon.service',
+ '--config-files',
+ '/etc/systemd/system/mullvad-early-boot-blocking.service',
+ distAssets('linux/mullvad-daemon.service') +'=/etc/systemd/system/',
+ distAssets('linux/mullvad-early-boot-blocking.service') +'=/etc/systemd/system/',
distAssets(path.join(getLinuxTargetSubdir(), 'mullvad')) + '=/usr/bin/',
+ distAssets(path.join(getLinuxTargetSubdir(), 'mullvad-daemon')) + '=/usr/bin/',
distAssets(path.join(getLinuxTargetSubdir(), 'mullvad-exclude')) + '=/usr/bin/',
distAssets('linux/problem-report-link') + '=/usr/bin/mullvad-problem-report',
distAssets('shell-completions/mullvad.bash') +
@@ -212,8 +215,13 @@ const config = {
'--rpm-posttrans',
distAssets('linux/post-transaction.sh'),
'--config-files',
- '/opt/Mullvad VPN/resources/mullvad-daemon.service',
+ '/etc/systemd/system/mullvad-daemon.service',
+ '--config-files',
+ '/etc/systemd/system/mullvad-early-boot-blocking.service',
+ distAssets('linux/mullvad-daemon.service') +'=/etc/systemd/system/',
+ distAssets('linux/mullvad-early-boot-blocking.service') +'=/etc/systemd/system/',
distAssets(path.join(getLinuxTargetSubdir(), 'mullvad')) + '=/usr/bin/',
+ distAssets(path.join(getLinuxTargetSubdir(), 'mullvad-daemon')) + '=/usr/bin/',
distAssets(path.join(getLinuxTargetSubdir(), 'mullvad-exclude')) + '=/usr/bin/',
distAssets('linux/problem-report-link') + '=/usr/bin/mullvad-problem-report',
distAssets('shell-completions/mullvad.bash') +