diff options
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | templates/connect/interface/node.def | 2 | ||||
| -rw-r--r-- | templates/connect/interface/node.tag/node.def | 28 | ||||
| -rw-r--r-- | templates/connect/node.def | 1 | ||||
| -rw-r--r-- | templates/disconnect/interface/node.def | 2 | ||||
| -rw-r--r-- | templates/disconnect/interface/node.tag/node.def | 34 | ||||
| -rw-r--r-- | templates/disconnect/node.def | 2 |
7 files changed, 1 insertions, 70 deletions
diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/templates/connect/interface/node.def b/templates/connect/interface/node.def deleted file mode 100644 index a94a721..0000000 --- a/templates/connect/interface/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Bring up a connection-oriented network interface - diff --git a/templates/connect/interface/node.tag/node.def b/templates/connect/interface/node.tag/node.def deleted file mode 100644 index 145e972..0000000 --- a/templates/connect/interface/node.tag/node.def +++ /dev/null @@ -1,28 +0,0 @@ -help: Bring up connection-oriented interface - -allowed: local -a array ; - array=( /etc/ppp/peers/pppoe* /etc/ppp/peers/pppoa* /etc/ppp/peers/wan* /etc/ppp/peers/wlm* ) ; - echo -n ${array[@]##*/} - -run: - IFNAME=${3} - LOGFILE=/var/log/vyatta/ppp_${IFNAME}.log - if [ ! -e /etc/ppp/peers/$IFNAME ]; then - echo "Invalid interface: $3" - elif [ -d /sys/class/net/$IFNAME ]; then - echo "Interface $IFNAME is already connected." - elif [ ! -z "`ps -C pppd -f | grep $IFNAME `" ]; then - echo "Interface ${IFNAME}: Connection is being established." - else - echo "Bringing interface $IFNAME up..." - echo "`date`: User $USER starting PPP daemon for $IFNAME by connect command" >> $LOGFILE - if [ "${IFNAME::3}" = "wan" ]; then - # Serial interfaces are started with "pon" - (umask 0; sudo /usr/sbin/pon $IFNAME > \ - /dev/null 2>&1 & ) - else - # PPPOE, PPPOA, WLM interfaces are started directly - ( umask 0; sudo setsid sh -c "nohup /usr/sbin/pppd \ - call $IFNAME > /tmp/${IFNAME}.log 2>&1 &" ) - fi - fi diff --git a/templates/connect/node.def b/templates/connect/node.def deleted file mode 100644 index 471f21f..0000000 --- a/templates/connect/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Establish a connection diff --git a/templates/disconnect/interface/node.def b/templates/disconnect/interface/node.def deleted file mode 100644 index c7d88e8..0000000 --- a/templates/disconnect/interface/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Take down a connection-oriented network interface - diff --git a/templates/disconnect/interface/node.tag/node.def b/templates/disconnect/interface/node.tag/node.def deleted file mode 100644 index 4a937b9..0000000 --- a/templates/disconnect/interface/node.tag/node.def +++ /dev/null @@ -1,34 +0,0 @@ -help: Bring connection-oriented interface down - -allowed: local -a array ; - array=( /etc/ppp/peers/pppoe* /etc/ppp/peers/pppoa* /etc/ppp/peers/wan* /etc/ppp/peers/wlm* ) ; - echo -n ${array[@]##*/} - -run: - IFNAME=${3} - LOGFILE=/var/log/vyatta/ppp_${IFNAME}.log - if [ ! -e /etc/ppp/peers/${IFNAME} ]; then - echo "Invalid interface: $IFNAME" - elif [ -z "`ps -C pppd -f | grep $IFNAME`" ]; then - echo "Interface $IFNAME: Connection is already down" - else - # Serial PPP interfaces are started with "pon", which - # lingers around as a watchdog process. Sometimes - # multiple "pon" scripts are running. So we need to kill - # all pon scripts relating to this interface before - # before killing the pppd process - if [ "${IFNAME::3}" = "wan" ]; then - PON_PIDS=` ps -C pon -f | grep $IFNAME | awk '{print $2}'` - if [ -n "$PON_PIDS" ]; then - echo "killing pon pids: $PON_PIDS" - for PID in $PON_PIDS ; do - sudo kill -HUP $PID - done - fi - fi - - echo "Bringing interface $IFNAME down..." - echo "`date`: User $USER stopping PPP daemon for $IFNAME by disconnect command" >> $LOGFILE - sudo /usr/bin/poff $IFNAME - fi - diff --git a/templates/disconnect/node.def b/templates/disconnect/node.def deleted file mode 100644 index fce9a97..0000000 --- a/templates/disconnect/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Take down a connection - |