Skip to content

Commit 7c76a7a

Browse files
committed
Improve Libreswan check
- If folder /etc/ipsec.d does not exist, don't skip Libreswan installation.
1 parent 57c2496 commit 7c76a7a

4 files changed

Lines changed: 4 additions & 0 deletions

File tree

vpnsetup_alpine.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ EOF
264264

265265
check_libreswan() {
266266
check_result=0
267+
[ ! -d /etc/ipsec.d ] && { get_swan_ver; return 0; }
267268
ipsec_ver=$(/usr/local/sbin/ipsec --version 2>/dev/null)
268269
swan_ver_old=$(printf '%s' "$ipsec_ver" | sed -e 's/.*Libreswan U\?//' -e 's/\( (\|\/K\).*//')
269270
ipsec_bin="/usr/local/sbin/ipsec"

vpnsetup_amzn.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ EOF
282282

283283
check_libreswan() {
284284
check_result=0
285+
[ ! -d /etc/ipsec.d ] && { get_swan_ver; return 0; }
285286
ipsec_ver=$(/usr/local/sbin/ipsec --version 2>/dev/null)
286287
swan_ver_old=$(printf '%s' "$ipsec_ver" | sed -e 's/.*Libreswan U\?//' -e 's/\( (\|\/K\).*//')
287288
ipsec_bin="/usr/local/sbin/ipsec"

vpnsetup_centos.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ EOF
385385

386386
check_libreswan() {
387387
check_result=0
388+
[ ! -d /etc/ipsec.d ] && { get_swan_ver; return 0; }
388389
ipsec_ver=$(/usr/local/sbin/ipsec --version 2>/dev/null)
389390
swan_ver_old=$(printf '%s' "$ipsec_ver" | sed -e 's/.*Libreswan U\?//' -e 's/\( (\|\/K\).*//')
390391
ipsec_bin="/usr/local/sbin/ipsec"

vpnsetup_ubuntu.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@ EOF
345345

346346
check_libreswan() {
347347
check_result=0
348+
[ ! -d /etc/ipsec.d ] && { get_swan_ver; return 0; }
348349
ipsec_ver=$(/usr/local/sbin/ipsec --version 2>/dev/null)
349350
swan_ver_old=$(printf '%s' "$ipsec_ver" | sed -e 's/.*Libreswan U\?//' -e 's/\( (\|\/K\).*//')
350351
ipsec_bin="/usr/local/sbin/ipsec"

0 commit comments

Comments
 (0)