diff options
| author | David Lönnhager <david.l@mullvad.net> | 2024-01-09 14:33:05 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2024-01-09 14:33:05 +0100 |
| commit | edbd1f52c44ba6ee9a290146f714453fc87e689d (patch) | |
| tree | 0118ae5c08ebf94026708479e500954eda8ce2d2 /test/scripts/ssh-setup.sh | |
| parent | 5d0bcc201050c90353418d3413a92e692ae3faee (diff) | |
| parent | e92eb7aaa1f354726191cd04477e586c6bc8a50d (diff) | |
| download | mullvadvpn-edbd1f52c44ba6ee9a290146f714453fc87e689d.tar.xz mullvadvpn-edbd1f52c44ba6ee9a290146f714453fc87e689d.zip | |
Merge branch 'testing-fail-if-ssh-setup-fails'
Diffstat (limited to 'test/scripts/ssh-setup.sh')
| -rw-r--r-- | test/scripts/ssh-setup.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/scripts/ssh-setup.sh b/test/scripts/ssh-setup.sh index 4aefcfdeed..bfe0b66f12 100644 --- a/test/scripts/ssh-setup.sh +++ b/test/scripts/ssh-setup.sh @@ -106,5 +106,8 @@ fi setup_systemd # Install required packages -which apt &>/dev/null && apt install -f xvfb wireguard-tools -which dnf &>/dev/null && dnf install -y xorg-x11-server-Xvfb wireguard-tools +if which apt &>/dev/null; then + apt install -f xvfb wireguard-tools +elif which dnf &>/dev/null; then + dnf install -y xorg-x11-server-Xvfb wireguard-tools +fi |