mirror of
https://github.com/OpenVPN/openvpn.git
synced 2024-09-19 19:42:30 +02:00
6fbf66fad3
It includes the --topology feature, and TAP-Win32 driver changes to allow non-admin access. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@580 e7ae566f-a301-0410-adde-c780ea21d3b5
80 lines
2.2 KiB
Diff
80 lines
2.2 KiB
Diff
--- /etc/init.d/openvpn 2004-05-12 20:30:06.000000000 +0200
|
|
+++ openvpn 2004-05-12 20:34:33.000000000 +0200
|
|
@@ -58,13 +58,13 @@
|
|
# returning success or failure status to caller (James Yonan).
|
|
|
|
# Location of openvpn binary
|
|
-openvpn="/usr/sbin/openvpn"
|
|
+openvpn=/usr/sbin/openvpn
|
|
|
|
# Lockfile
|
|
-lock="/var/lock/subsys/openvpn"
|
|
+lock=/var/lock/subsys/openvpn
|
|
|
|
# PID directory
|
|
-piddir="/var/run/openvpn"
|
|
+piddir=/var/run/openvpn
|
|
|
|
# Our working directory
|
|
work=/etc/openvpn
|
|
@@ -106,7 +106,7 @@
|
|
|
|
if [ -f $lock ]; then
|
|
# we were not shut down correctly
|
|
- for pidf in `/bin/ls $piddir/*.pid $piddir/*/*.pid 2>/dev/null`; do
|
|
+ for pidf in `find $piddir -name "*.pid" 2>/dev/null`; do
|
|
if [ -s $pidf ]; then
|
|
kill `cat $pidf` >/dev/null 2>&1
|
|
fi
|
|
@@ -116,12 +116,12 @@
|
|
sleep 2
|
|
fi
|
|
|
|
- rm -f $piddir/*.pid $piddir/*/*.pid
|
|
+ find $piddir -name "*.pid"|xargs rm -f
|
|
|
|
# Start every .conf in $work and run .sh if exists
|
|
errors=0
|
|
successes=0
|
|
- for c in `/bin/ls *.conf */*.conf 2>/dev/null`; do
|
|
+ for c in `find * -name "*.conf" 2>/dev/null`; do
|
|
bn=${c%%.conf}
|
|
if [ -f "$bn.sh" ]; then
|
|
. $bn.sh
|
|
@@ -147,7 +147,7 @@
|
|
;;
|
|
stop)
|
|
echo -n $"Shutting down openvpn: "
|
|
- for pidf in `/bin/ls $piddir/*.pid $piddir/*/*.pid 2>/dev/null`; do
|
|
+ for pidf in `find $piddir -name "*.pid" 2>/dev/null`; do
|
|
if [ -s $pidf ]; then
|
|
kill `cat $pidf` >/dev/null 2>&1
|
|
fi
|
|
@@ -163,7 +163,7 @@
|
|
;;
|
|
reload)
|
|
if [ -f $lock ]; then
|
|
- for pidf in `/bin/ls $piddir/*.pid $piddir/*/*.pid 2>/dev/null`; do
|
|
+ for pidf in `find $piddir -name "*.pid" 2>/dev/null`; do
|
|
if [ -s $pidf ]; then
|
|
kill -HUP `cat $pidf` >/dev/null 2>&1
|
|
fi
|
|
@@ -175,7 +175,7 @@
|
|
;;
|
|
reopen)
|
|
if [ -f $lock ]; then
|
|
- for pidf in `/bin/ls $piddir/*.pid $piddir/*/*.pid 2>/dev/null`; do
|
|
+ for pidf in `find $piddir -name "*.pid" 2>/dev/null`; do
|
|
if [ -s $pidf ]; then
|
|
kill -USR1 `cat $pidf` >/dev/null 2>&1
|
|
fi
|
|
@@ -195,7 +195,7 @@
|
|
;;
|
|
status)
|
|
if [ -f $lock ]; then
|
|
- for pidf in `/bin/ls $piddir/*.pid $piddir/*/*.pid 2>/dev/null`; do
|
|
+ for pidf in `find $piddir -name "*.pid" 2>/dev/null`; do
|
|
if [ -s $pidf ]; then
|
|
kill -USR2 `cat $pidf` >/dev/null 2>&1
|
|
fi
|