diff options
Diffstat (limited to 'gentoo-linux/net-misc/anytun/files/anytun-0.3.3.init')
| -rwxr-xr-x | gentoo-linux/net-misc/anytun/files/anytun-0.3.3.init | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gentoo-linux/net-misc/anytun/files/anytun-0.3.3.init b/gentoo-linux/net-misc/anytun/files/anytun-0.3.3.init index 7a61b11..e629043 100755 --- a/gentoo-linux/net-misc/anytun/files/anytun-0.3.3.init +++ b/gentoo-linux/net-misc/anytun/files/anytun-0.3.3.init @@ -40,7 +40,7 @@ start_vpn () { test -d $VARRUN_DIR || mkdir -p $VARRUN_DIR DAEMONARG=`sed 's/#.*//' < $CONFIG_DIR/$NAME/config | grep -e '\w' | sed 's/^/--/' | tr '\n' ' '` start-stop-daemon --start --pidfile $VARRUN_DIR/${NAME}.pid --exec $DAEMON -- --write-pid $VARRUN_DIR/${NAME}.pid $POSTUP \ - $DAEMONOPTS $DAEMONARG || return 1 + $DAEMONOPTS $DAEMONARG || return 1 else eerror "no config found" return 1 @@ -49,7 +49,7 @@ start_vpn () { return 0 } stop_vpn () { - start-stop-daemon --stop --pidfile $PIDFILE --exec $DAEMON --oknodo + start-stop-daemon --stop --pidfile $PIDFILE --exec $DAEMON rm -f $PIDFILE stop_configd } @@ -60,8 +60,8 @@ start_configd () { chmod 700 $VARCONFIG_DIR rm -f $VARCONFIG_DIR/$NAME 2>/dev/null KDPRF=`sed 's/#.*//' < $CONFIG_DIR/$NAME/config | grep -e 'kd-prf' | sed 's/^/ --/' | xargs echo` - for CLIENTNAME in `ls $CONFIG_DIR/$NAME/conf.d`; do - DAEMONARG=`sed 's/#.*//' < $CONFIG_DIR/$NAME/conf.d/$CLIENTNAME | grep -e '\w' | sed 's/^/ --/' | xargs echo` + for CLIENTPATH in $CONFIG_DIR/$NAME/conf.d/* ; do + DAEMONARG=`sed 's/#.*//' < $CLIENTPATH | grep -e '\w' | sed 's/^/ --/' | xargs echo` $ANYTUNCONFIG $DAEMONARG $CIPHER $AUTHALGO $KDPRF >> $VARCONFIG_DIR/$NAME done CONTROLHOST=`sed 's/#.*//' < $CONFIG_DIR/$NAME/config | grep -e 'control-host' | sed 's/^/ --/'i | xargs echo` @@ -71,7 +71,7 @@ start_configd () { } stop_configd () { if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then - start-stop-daemon --stop --pidfile $VARCONFIG_DIR/${NAME}.pid --exec $CONTROLDAEMON --oknodo + start-stop-daemon --stop --pidfile $VARCONFIG_DIR/${NAME}.pid --exec $CONTROLDAEMON rm -f $VARCONFIG_DIR/${NAME}.pid fi } @@ -98,15 +98,15 @@ start () { stop () { if test -z "$VPN" ; then - for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do + for PIDFILE in ${VARRUN_DIR}/*.pid ; do NAME=`basename $PIDFILE .pid` ebegin "Stopping ${DESC} VPN: ${NAME}" stop_vpn eend $? done else - if test -e $VARRUN_DIR/${VPN}.pid ; then - PIDFILE=`ls $VARRUN_DIR/${VPN}.pid 2> /dev/null` + if test -e ${VARRUN_DIR}/${VPN}.pid ; then + PIDFILE=${VARRUN_DIR}/${VPN}.pid NAME=`basename $PIDFILE .pid` ebegin "Stopping ${DESC} VPN: ${NAME}" stop_vpn @@ -119,7 +119,7 @@ stop () { reload () { if test -z "$VPN" ; then - for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do + for PIDFILE in ${VARRUN_DIR}/*.pid ; do NAME=`basename $PIDFILE .pid` if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then ebegin "Reloading ${DESC} VPN: ${NAME}" @@ -134,8 +134,8 @@ reload () { fi done else - if test -e $VARRUN_DIR/${VPN}.pid ; then - PIDFILE=`ls $VARRUN_DIR/${VPN}.pid 2> /dev/null` + if test -e ${VARRUN_DIR}/${VPN}.pid ; then + PIDFILE=${VARRUN_DIR}/${VPN}.pid NAME=`basename $PIDFILE .pid` if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then ebegin "Reloading ${DESC} VPN: ${NAME}" |