From 819c537b5eed9df6f48b7eff2f7f0716807f957a Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Fri, 17 Sep 2021 23:47:09 -0500
Subject: [PATCH] Improve /dev/ppp check
- Show a warning instead of exiting with an error for missing /dev/ppp,
which could happen on Debian 11/10 with certain Linux kernels. Users
can use the IKEv2 or IPsec/XAuth ("Cisco IPsec") mode to connect.
Ref: https://git.io/vpndebian10
---
extras/quickstart.sh | 3 ---
vpnsetup.sh | 3 ---
vpnsetup_ubuntu.sh | 12 ++++++++----
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/extras/quickstart.sh b/extras/quickstart.sh
index dc4da2b..b499565 100755
--- a/extras/quickstart.sh
+++ b/extras/quickstart.sh
@@ -82,9 +82,6 @@ check_os() {
if [ "$os_ver" = "8" ] || [ "$os_ver" = "jessiesid" ]; then
exiterr "Debian 8 or Ubuntu < 16.04 is not supported."
fi
- if { [ "$os_ver" = "10" ] || [ "$os_ver" = "11" ]; } && [ ! -e /dev/ppp ]; then
- exiterr "/dev/ppp is missing. Debian 11 or 10 users, see: https://git.io/vpndebian10"
- fi
fi
fi
}
diff --git a/vpnsetup.sh b/vpnsetup.sh
index 0581295..5e3fb88 100755
--- a/vpnsetup.sh
+++ b/vpnsetup.sh
@@ -104,9 +104,6 @@ check_os() {
if [ "$os_ver" = "8" ] || [ "$os_ver" = "jessiesid" ]; then
exiterr "Debian 8 or Ubuntu < 16.04 is not supported."
fi
- if { [ "$os_ver" = "10" ] || [ "$os_ver" = "11" ]; } && [ ! -e /dev/ppp ]; then
- exiterr "/dev/ppp is missing. Debian 11 or 10 users, see: https://git.io/vpndebian10"
- fi
fi
fi
}
diff --git a/vpnsetup_ubuntu.sh b/vpnsetup_ubuntu.sh
index 5b40b0e..de6ff29 100755
--- a/vpnsetup_ubuntu.sh
+++ b/vpnsetup_ubuntu.sh
@@ -77,14 +77,10 @@ check_os() {
exiterr "This script only supports Ubuntu and Debian."
;;
esac
-
os_ver=$(sed 's/\..*//' /etc/debian_version | tr -dc 'A-Za-z0-9')
if [ "$os_ver" = "8" ] || [ "$os_ver" = "jessiesid" ]; then
exiterr "Debian 8 or Ubuntu < 16.04 is not supported."
fi
- if { [ "$os_ver" = "10" ] || [ "$os_ver" = "11" ]; } && [ ! -e /dev/ppp ]; then
- exiterr "/dev/ppp is missing. Debian 11 or 10 users, see: https://git.io/vpndebian10"
- fi
}
check_iface() {
@@ -588,6 +584,14 @@ IKEv2 guide: https://git.io/ikev2
================================================
EOF
+ if [ ! -e /dev/ppp ]; then
+cat <<'EOF'
+Warning: /dev/ppp is missing, and IPsec/L2TP mode may not work. Please use
+ IKEv2 (https://git.io/ikev2) or IPsec/XAuth ("Cisco IPsec") mode
+ to connect. Debian 11/10 users, see https://git.io/vpndebian10.
+
+EOF
+ fi
}
check_swan_ver() {