Skip to content

Commit 909bf12

Browse files
hwdsl2hwdsl2
committed
Update OS support
- Add CentOS Stream 10 - Add a check for Ubuntu 25.04, which is not currently supported.
1 parent 25da664 commit 909bf12

8 files changed

Lines changed: 48 additions & 32 deletions

File tree

‎extras/ikev2setup.sh‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,11 @@ check_os() {
6363
elif grep -q "release 9" "$rh_file"; then
6464
os_ver=9
6565
grep -qi stream "$rh_file" && os_ver=9s
66+
elif grep -q "release 10" "$rh_file"; then
67+
os_ver=10
68+
grep -qi stream "$rh_file" && os_ver=10s
6669
else
67-
exiterr "This script only supports CentOS/RHEL 7-9."
70+
exiterr "This script only supports CentOS/RHEL 7-10."
6871
fi
6972
if [ "$os_type" = "centos" ] \
7073
&& { [ "$os_ver" = 7 ] || [ "$os_ver" = 8 ] || [ "$os_ver" = 8s ]; }; then
@@ -110,14 +113,6 @@ EOF
110113
cat 1>&2 <<EOF
111114
Error: This script requires Debian >= 10 or Ubuntu >= 20.04.
112115
This version of Ubuntu/Debian is too old and not supported.
113-
EOF
114-
exit 1
115-
fi
116-
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ] \
117-
&& [ "$(. /etc/os-release && printf '%s' "$VERSION_ID")" = "24.10" ]; then
118-
cat 1>&2 <<EOF
119-
Error: This script does not support Ubuntu 24.10.
120-
You may use e.g. Ubuntu 24.04 LTS instead.
121116
EOF
122117
exit 1
123118
fi
@@ -177,7 +172,7 @@ confirm_or_abort() {
177172
show_header() {
178173
cat <<'EOF'
179174
180-
IKEv2 Script Copyright (c) 2020-2025 Lin Song 09 May 2025
175+
IKEv2 Script Copyright (c) 2020-2025 Lin Song 12 May 2025
181176
182177
EOF
183178
}

‎extras/vpnuninstall.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ check_os() {
4343
[ -f /etc/oracle-release ] && os_type=ol
4444
grep -qi rocky "$rh_file" && os_type=rocky
4545
grep -qi alma "$rh_file" && os_type=alma
46-
if ! grep -q -E "release (7|8|9)" "$rh_file"; then
47-
exiterr "This script only supports CentOS/RHEL 7-9."
46+
if ! grep -q -E "release (7|8|9|10)" "$rh_file"; then
47+
exiterr "This script only supports CentOS/RHEL 7-10."
4848
fi
4949
elif grep -qs "Amazon Linux release 2 " /etc/system-release; then
5050
os_type=amzn

‎extras/vpnupgrade.sh‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,11 @@ check_os() {
5454
elif grep -q "release 9" "$rh_file"; then
5555
os_ver=9
5656
grep -qi stream "$rh_file" && os_ver=9s
57+
elif grep -q "release 10" "$rh_file"; then
58+
os_ver=10
59+
grep -qi stream "$rh_file" && os_ver=10s
5760
else
58-
exiterr "This script only supports CentOS/RHEL 7-9."
61+
exiterr "This script only supports CentOS/RHEL 7-10."
5962
fi
6063
if [ "$os_type" = "centos" ] \
6164
&& { [ "$os_ver" = 7 ] || [ "$os_ver" = 8 ] || [ "$os_ver" = 8s ]; }; then
@@ -104,13 +107,15 @@ Error: This script requires Debian >= 10 or Ubuntu >= 20.04.
104107
EOF
105108
exit 1
106109
fi
107-
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ] \
108-
&& [ "$(. /etc/os-release && printf '%s' "$VERSION_ID")" = "24.10" ]; then
110+
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ]; then
111+
ubuntu_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID")
112+
if [ "$ubuntu_ver" = "24.10" ] || [ "$ubuntu_ver" = "25.04" ]; then
109113
cat 1>&2 <<EOF
110-
Error: This script does not support Ubuntu 24.10.
114+
Error: This script does not support Ubuntu 24.10 or 25.04.
111115
You may use e.g. Ubuntu 24.04 LTS instead.
112116
EOF
113-
exit 1
117+
exit 1
118+
fi
114119
fi
115120
fi
116121
fi

‎extras/vpnupgrade_centos.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,11 @@ check_os() {
5757
elif grep -q "release 9" "$rh_file"; then
5858
os_ver=9
5959
grep -qi stream "$rh_file" && os_ver=9s
60+
elif grep -q "release 10" "$rh_file"; then
61+
os_ver=10
62+
grep -qi stream "$rh_file" && os_ver=10s
6063
else
61-
exiterr "This script only supports CentOS/RHEL 7-9."
64+
exiterr "This script only supports CentOS/RHEL 7-10."
6265
fi
6366
if [ "$os_type" = "centos" ] \
6467
&& { [ "$os_ver" = 7 ] || [ "$os_ver" = 8 ] || [ "$os_ver" = 8s ]; }; then

‎extras/vpnupgrade_ubuntu.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,15 @@ Error: This script requires Debian >= 10 or Ubuntu >= 20.04.
6565
EOF
6666
exit 1
6767
fi
68-
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ] \
69-
&& [ "$(. /etc/os-release && printf '%s' "$VERSION_ID")" = "24.10" ]; then
68+
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ]; then
69+
ubuntu_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID")
70+
if [ "$ubuntu_ver" = "24.10" ] || [ "$ubuntu_ver" = "25.04" ]; then
7071
cat 1>&2 <<EOF
71-
Error: This script does not support Ubuntu 24.10.
72+
Error: This script does not support Ubuntu 24.10 or 25.04.
7273
You may use e.g. Ubuntu 24.04 LTS instead.
7374
EOF
74-
exit 1
75+
exit 1
76+
fi
7577
fi
7678
}
7779

‎vpnsetup.sh‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,11 @@ check_os() {
8484
elif grep -q "release 9" "$rh_file"; then
8585
os_ver=9
8686
grep -qi stream "$rh_file" && os_ver=9s
87+
elif grep -q "release 10" "$rh_file"; then
88+
os_ver=10
89+
grep -qi stream "$rh_file" && os_ver=10s
8790
else
88-
exiterr "This script only supports CentOS/RHEL 7-9."
91+
exiterr "This script only supports CentOS/RHEL 7-10."
8992
fi
9093
if [ "$os_type" = "centos" ] \
9194
&& { [ "$os_ver" = 7 ] || [ "$os_ver" = 8 ] || [ "$os_ver" = 8s ]; }; then
@@ -136,13 +139,15 @@ Error: This script requires Debian >= 10 or Ubuntu >= 20.04.
136139
EOF
137140
exit 1
138141
fi
139-
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ] \
140-
&& [ "$(. /etc/os-release && printf '%s' "$VERSION_ID")" = "24.10" ]; then
142+
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ]; then
143+
ubuntu_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID")
144+
if [ "$ubuntu_ver" = "24.10" ] || [ "$ubuntu_ver" = "25.04" ]; then
141145
cat 1>&2 <<EOF
142-
Error: This script does not support Ubuntu 24.10.
146+
Error: This script does not support Ubuntu 24.10 or 25.04.
143147
You may use e.g. Ubuntu 24.04 LTS instead.
144148
EOF
145-
exit 1
149+
exit 1
150+
fi
146151
fi
147152
fi
148153
fi

‎vpnsetup_centos.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,11 @@ check_os() {
8989
elif grep -q "release 9" "$rh_file"; then
9090
os_ver=9
9191
grep -qi stream "$rh_file" && os_ver=9s
92+
elif grep -q "release 10" "$rh_file"; then
93+
os_ver=10
94+
grep -qi stream "$rh_file" && os_ver=10s
9295
else
93-
exiterr "This script only supports CentOS/RHEL 7-9."
96+
exiterr "This script only supports CentOS/RHEL 7-10."
9497
fi
9598
if [ "$os_type" = "centos" ] \
9699
&& { [ "$os_ver" = 7 ] || [ "$os_ver" = 8 ] || [ "$os_ver" = 8s ]; }; then
@@ -282,6 +285,7 @@ install_vpn_pkgs_3() {
282285
yum -y -q install $p1 $p2 >/dev/null
283286
) || exiterr2
284287
if [ "$os_ver" = 9 ] || [ "$os_ver" = 9s ] \
288+
|| [ "$os_ver" = 10 ] || [ "$os_ver" = 10s ] \
285289
|| systemctl is-active --quiet firewalld \
286290
|| systemctl is-active --quiet nftables \
287291
|| grep -qs "hwdsl2 VPN script" /etc/sysconfig/nftables.conf; then

‎vpnsetup_ubuntu.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,15 @@ Error: This script requires Debian >= 10 or Ubuntu >= 20.04.
9696
EOF
9797
exit 1
9898
fi
99-
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ] \
100-
&& [ "$(. /etc/os-release && printf '%s' "$VERSION_ID")" = "24.10" ]; then
99+
if [ "$os_ver" = "trixiesid" ] && [ -f /etc/os-release ]; then
100+
ubuntu_ver=$(. /etc/os-release && printf '%s' "$VERSION_ID")
101+
if [ "$ubuntu_ver" = "24.10" ] || [ "$ubuntu_ver" = "25.04" ]; then
101102
cat 1>&2 <<EOF
102-
Error: This script does not support Ubuntu 24.10.
103+
Error: This script does not support Ubuntu 24.10 or 25.04.
103104
You may use e.g. Ubuntu 24.04 LTS instead.
104105
EOF
105-
exit 1
106+
exit 1
107+
fi
106108
fi
107109
}
108110

0 commit comments

Comments
 (0)