| Revision | 28bd2776477d24c9aa7848d98a77465291afac58 (tree) |
|---|---|
| Time | 2017-08-29 19:05:00 |
| Author | Tatsuki Sugiura <sugi@nemu...> |
| Commiter | Tatsuki Sugiura |
First version.
PPPConnection (diff)| @@ -201,10 +201,10 @@ ppp_stop() { | ||
| 201 | 201 | ocf_log err "ppp connection is still active with isp '${ISP}', giving up to stop!" |
| 202 | 202 | return $OCF_ERR_GENERIC |
| 203 | 203 | elif [ "$tries" -gt 8 ]; then |
| 204 | - ocf_log warn "pppd is still running with isp '${ISP}'. Trying to send KILL signal..." | |
| 204 | + ocf_log warn "pppd still running with isp '${ISP}'. Trying to send KILL signal..." | |
| 205 | 205 | kill -KILL `ps -ewwwo pid,args | $EGREP "[p]ppd call ${ISP}\$" | $AWK '{print $1}'` |
| 206 | 206 | elif [ "$tries" -gt 5 ]; then |
| 207 | - ocf_log warn "pppd is still running with isp '${ISP}'. Trying to send TERM signal..." | |
| 207 | + ocf_log warn "pppd still running with isp '${ISP}'. Trying to send TERM signal..." | |
| 208 | 208 | kill -TERM `ps -ewwwo pid,args | $EGREP "[p]ppd call ${ISP}\$" | $AWK '{print $1}'` |
| 209 | 209 | fi |
| 210 | 210 | sleep $OCF_RESKEY_poff_wait_sec |
| @@ -279,9 +279,11 @@ ppp_validate | ||
| 279 | 279 | case $__OCF_ACTION in |
| 280 | 280 | start) |
| 281 | 281 | ppp_start |
| 282 | + exit $? | |
| 282 | 283 | ;; |
| 283 | 284 | stop) |
| 284 | 285 | ppp_stop |
| 286 | + exit $? | |
| 285 | 287 | ;; |
| 286 | 288 | status) |
| 287 | 289 | ip_status=`ppp_echo_status` |
| @@ -298,6 +300,7 @@ case $__OCF_ACTION in | ||
| 298 | 300 | exit $? |
| 299 | 301 | ;; |
| 300 | 302 | validate-all) |
| 303 | + exit $OCF_SUCCESS | |
| 301 | 304 | ;; |
| 302 | 305 | *) |
| 303 | 306 | ppp_usage |
Fork