OSDN Git Service
(root)
/
osdn-codes
/
ppp-resource-agents.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update version to 0.2.
[osdn-codes/ppp-resource-agents.git]
/
PPPConnection
diff --git
a/PPPConnection
b/PPPConnection
index
936a702
..
bbb45cb
100755
(executable)
--- a/
PPPConnection
+++ b/
PPPConnection
@@
-51,8
+51,8
@@
meta_data() {
cat <<EOM
<?xml version="1.0"?>
<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
cat <<EOM
<?xml version="1.0"?>
<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-<resource-agent name="PPPConnection"
version="0.1"
>
- <version>0.
1
</version>
+<resource-agent name="PPPConnection">
+ <version>0.
2
</version>
<longdesc lang="en">
Handle ppp connection as OCF resource. This resource calls pon/poff to connect ppp.
</longdesc>
<longdesc lang="en">
Handle ppp connection as OCF resource. This resource calls pon/poff to connect ppp.
</longdesc>
@@
-176,15
+176,6
@@
ppp_start() {
sleep $OCF_RESKEY_pon_wait_sec
fi
done
sleep $OCF_RESKEY_pon_wait_sec
fi
done
- tries=0
- while ! ppp_check_ip; do
- tries=`expr $tries + 1`
- sleep 1
- if [ "$tries" -gt "$OCF_RESKEY_ip_wait_sec" ]; then
- ocf_log err "Timeout to aquire expected IP address ${IP4} ${IP6}."
- return $OCF_ERR_GENERIC
- fi
- done
return $OCF_SUCCESS
}
return $OCF_SUCCESS
}
@@
-234,10
+225,16
@@
ppp_echo_status() {
echo "disconnected"
return 0
fi
echo "disconnected"
return 0
fi
- if ! ppp_check_ip; then
- echo "connecting"
- return 0
- fi
+ tries=0
+ while ! ppp_check_ip; do
+ tries=`expr $tries + 1`
+ if [ "$tries" -gt "$OCF_RESKEY_ip_wait_sec" ]; then
+ ocf_log err "Timeout for waiting expected IP address (${IP4} ${IP6})."
+ echo "connecting"
+ return 0
+ fi
+ sleep 1
+ done
echo "connected"
return 0
}
echo "connected"
return 0
}