diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2018-05-07 13:40:10 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-05-07 13:40:59 +0200 |
| commit | 227d766c1976eca1e2ab1dd70ce6a32d3243069a (patch) | |
| tree | a8a1097ce8ea727c2674ba7d3cb9553f82b1e537 | |
| parent | 8570448c7c882b01e18ec3d74d1a02ba049816e1 (diff) | |
| download | aports-227d766c1976eca1e2ab1dd70ce6a32d3243069a.tar.bz2 aports-227d766c1976eca1e2ab1dd70ce6a32d3243069a.tar.xz | |
main/openvpn: fix initscript to not check cfgfile when doesn't exist
| -rw-r--r-- | main/openvpn/APKBUILD | 4 | ||||
| -rw-r--r-- | main/openvpn/openvpn.initd | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/openvpn/APKBUILD b/main/openvpn/APKBUILD index 098ba81349..de3c5442d8 100644 --- a/main/openvpn/APKBUILD +++ b/main/openvpn/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openvpn pkgver=2.4.6 -pkgrel=0 +pkgrel=1 pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)" url="http://openvpn.sourceforge.net/" arch="all" @@ -60,7 +60,7 @@ pam() { sha512sums="cdd70bfd03177bc6cb70d0d614e40389df00816b7097740b4cda9d7bee094d1463fdb5afeaf604c52c7b3167d1edb098a2e095e131a8b9fed0ed8b29da90cbe8 openvpn-2.4.6.tar.gz 5a083cdf8216db5e6e4577c00ccfe8e03ca318935ec9daa2018a8a6d4d7fd2b04fe395d7b329f16108101d69a6c0b70690883fda2cb552db7abf2f8246cc561f libressl.patch -7403beec406261d7d8b7b011f5be1bb30a55cd1e743f87cc907fc4824d44fd223010550159d3a7e450d8567fdec52558137021cc8f0782e8486a17a2d4b07e1b openvpn.initd +78324d4eb59fb91cfab8d246f52c729a3656117e715d9704c89edf628398ed3ed203b7841047754f208c5e90dec1cd2983e651efbfeb16faab5aa48e4aa166eb openvpn.initd 643b5ee3f23b1634c12488f6de2d42cdc5c49618d5291a25963fb1516156273b0308a46b6623905fd441753cb5ae1b08c0e29bc5543e287847bb41f73fd357f0 openvpn.confd cdb73c9a5b1eb56e9cbd29955d94297ce5a87079419cd626d6a0b6680d88cbf310735a53f794886df02030b687eaea553c7c569a8ea1282a149441add1c65760 openvpn.up 4456880d5c2db061219ba94e4052786700efa5e685f03b0d12d75a6023e3c0fc7b5242cc3d2bd3988e42fcd99701ab13a6257b1a0943b812318d30c64843ad27 openvpn.down" diff --git a/main/openvpn/openvpn.initd b/main/openvpn/openvpn.initd index 33cb01ddae..407bf0ca58 100644 --- a/main/openvpn/openvpn.initd +++ b/main/openvpn/openvpn.initd @@ -30,7 +30,7 @@ required_files="$cfgfile" # cfgfile as in old version of this runscript. Eventually we try to fix the # config when checkconfig() is run. # This is for backward compatibility with Alpine < v3.8. -if [ -z "$client_mode" ]; then +if [ -z "$client_mode" ] && [ -f "$cfgfile" ]; then yesno "${DETECT_CLIENT:-yes}" && grep -q '^\s*remote\s' "$cfgfile" \ && client_mode=yes \ || client_mode=no |