diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2022-09-02 15:10:55 +0200 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2022-09-13 11:51:04 +0200 |
| commit | b358f13b5a02c30f0155b9feb22413b04dde81c0 (patch) | |
| tree | b876a2c779c8f320292544c983e715051667031d /gui | |
| parent | 9be68db2506f6e5fe28f58acc2495ab8bd3b67d5 (diff) | |
| download | mullvadvpn-b358f13b5a02c30f0155b9feb22413b04dde81c0.tar.xz mullvadvpn-b358f13b5a02c30f0155b9feb22413b04dde81c0.zip | |
Improve daemon unit file
Set the `MULLVAD_RESOURCE_DIR` environment variable and specify the
path as a required mount path.
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/tasks/distribution.js | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js index 45b9ce851b..7152eb4b8a 100644 --- a/gui/tasks/distribution.js +++ b/gui/tasks/distribution.js @@ -186,12 +186,8 @@ const config = { distAssets('linux/before-install.sh'), '--before-remove', distAssets('linux/before-remove.sh'), - '--config-files', - '/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('linux/mullvad-daemon.service') +'=/usr/lib/systemd/system/mullvad-daemon.service', + distAssets('linux/mullvad-early-boot-blocking.service') +'=/usr/lib/systemd/system/mullvad-early-boot-blocking.service', distAssets(path.join(getLinuxTargetSubdir(), 'mullvad')) + '=/usr/bin/', distAssets(path.join(getLinuxTargetSubdir(), 'mullvad-daemon')) + '=/usr/bin/', distAssets(path.join(getLinuxTargetSubdir(), 'mullvad-exclude')) + '=/usr/bin/', @@ -214,12 +210,8 @@ const config = { distAssets('linux/before-remove.sh'), '--rpm-posttrans', distAssets('linux/post-transaction.sh'), - '--config-files', - '/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('linux/mullvad-daemon.service') +'=/usr/lib/systemd/system/mullvad-daemon.service', + distAssets('linux/mullvad-early-boot-blocking.service') +'=/usr/lib/systemd/system/mullvad-early-boot-blocking.service', distAssets(path.join(getLinuxTargetSubdir(), 'mullvad')) + '=/usr/bin/', distAssets(path.join(getLinuxTargetSubdir(), 'mullvad-daemon')) + '=/usr/bin/', distAssets(path.join(getLinuxTargetSubdir(), 'mullvad-exclude')) + '=/usr/bin/', |