diff options
| author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2008-03-23 10:45:18 +0000 |
|---|---|---|
| committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2008-03-23 10:45:18 +0000 |
| commit | f74addf13856524b4a92680b9fa1e937fbc00fa9 (patch) | |
| tree | 56d6eb744ee85d678f4cfd56dcced68a04323003 /security/vpnc | |
| parent | a426c124f55b242e6d13f968cd0c22d523f31c50 (diff) | |
| download | ports-f74addf13856524b4a92680b9fa1e937fbc00fa9.tar.gz ports-f74addf13856524b4a92680b9fa1e937fbc00fa9.zip | |
Follow the change of the pid file in the rc script.
Submitted by: Dominic Fandrey <kamikaze@bsdforen.de>
Notes
Notes:
svn path=/head/; revision=209616
Diffstat (limited to 'security/vpnc')
| -rw-r--r-- | security/vpnc/Makefile | 2 | ||||
| -rw-r--r-- | security/vpnc/files/vpnc.in | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile index 993c6815e1d4..731fcc5219c4 100644 --- a/security/vpnc/Makefile +++ b/security/vpnc/Makefile @@ -7,7 +7,7 @@ PORTNAME= vpnc PORTVERSION= 0.5.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MASTER_SITES= http://www.unix-ag.uni-kl.de/~massar/vpnc/ \ http://critical.ch/distfiles/ \ diff --git a/security/vpnc/files/vpnc.in b/security/vpnc/files/vpnc.in index 094f15f68f50..2422d0c1d73b 100644 --- a/security/vpnc/files/vpnc.in +++ b/security/vpnc/files/vpnc.in @@ -17,6 +17,7 @@ # Default settings - don't change this. : ${vpnc_enable="NO"} : ${vpnc_pid_dir="/var/run"} +: ${vpnc_pid_file="vpnc/pid"} : ${vpnc_conf_dir="%%PREFIX%%/etc"} : ${vpnc_record="$vpnc_pid_dir/vpnc.record"} @@ -52,12 +53,12 @@ vpnc_start() { fi # Wait for the system to catch up. - /bin/sleep 2 + /bin/sleep 1 # Copy files to allow a clean shutdown # of multiple connections. - /bin/cp "$vpnc_pid_dir/vpnc.pid" "$vpnc_pid_dir/vpnc.$config.pid" + /bin/cp "$vpnc_pid_dir/$vpnc_pid_file" "$vpnc_pid_dir/vpnc.$config.pid" /bin/cp "$vpnc_pid_dir/vpnc.defaultroute" "$vpnc_pid_dir/vpnc.$config.defaultroute" 2> /dev/null /bin/cp "$vpnc_pid_dir/vpnc.resolv.conf-backup" "$vpnc_pid_dir/vpnc.$config.resolv.conf-backup" 2> /dev/null echo "$config" >> "$vpnc_record" @@ -84,7 +85,7 @@ vpnc_stop() { # Move the vpnc files back into position. - /bin/mv "$vpnc_pid_dir/vpnc.$config.pid" "$vpnc_pid_dir/vpnc.pid" + /bin/mv "$vpnc_pid_dir/vpnc.$config.pid" "$vpnc_pid_dir/$vpnc_pid_file" /bin/mv "$vpnc_pid_dir/vpnc.$config.defaultroute" "$vpnc_pid_dir/vpnc.defaultroute" 2> /dev/null /bin/mv "$vpnc_pid_dir/vpnc.$config.resolv.conf-backup" "$vpnc_pid_dir/vpnc.resolv.conf-backup" 2> /dev/null |