You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/27 06:58:02 UTC
[5/33] git commit: CS-16393
CS-16393
one typo fix
make passwd service exitable
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c5871378
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c5871378
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c5871378
Branch: refs/heads/4.0
Commit: c58713780f9aeccaa777e5f733025fb2c478b8e5
Parents: 9afe06e
Author: Anthony Xu <an...@cloud.com>
Authored: Tue Sep 25 13:57:15 2012 -0700
Committer: Edison Su <di...@gmail.com>
Committed: Wed Sep 26 21:56:30 2012 -0700
----------------------------------------------------------------------
.../debian/config/opt/cloud/bin/vpc_guestnw.sh | 2 +-
.../debian/config/opt/cloud/bin/vpc_passwd_server | 18 ++++++++------
2 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c5871378/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh b/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
index e824091..2ec5783 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
+++ b/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh
@@ -89,7 +89,7 @@ setup_dnsmasq() {
echo "dhcp-option=tag:interface-$dev,15,$DOMAIN" >> /etc/dnsmasq.d/cloud.conf
service dnsmasq restart
sleep 1
-}
+}
desetup_dnsmasq() {
logger -t cloud "Desetting up dnsmasq for network $ip/$mask "
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c5871378/patches/systemvm/debian/config/opt/cloud/bin/vpc_passwd_server
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_passwd_server b/patches/systemvm/debian/config/opt/cloud/bin/vpc_passwd_server
index 2b9deb1..2d6b4e6 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/vpc_passwd_server
+++ b/patches/systemvm/debian/config/opt/cloud/bin/vpc_passwd_server
@@ -1,13 +1,15 @@
#!/bin/bash
ip=$1
-while [ -n "$ip" ]
+result=$ip
+while [ -n "$result" ]
do
- socat -lf /var/log/cloud.log TCP4-LISTEN:8080,reuseaddr,crnl,bind=$ip SYSTEM:"/opt/cloud/bin/serve_password.sh"
- rc=$?
- if [ $rc -ne 0 ]
- then
- logger -t cloud "Password server failed with error code $rc. Restarting socat..."
- sleep 3
- fi
+ socat -lf /var/log/cloud.log TCP4-LISTEN:8080,reuseaddr,crnl,bind=$ip SYSTEM:"/opt/cloud/bin/serve_password.sh"
+ rc=$?
+ if [ $rc -ne 0 ]
+ then
+ logger -t cloud "Password server failed with error code $rc. Restarting socat..."
+ sleep 3
+ fi
+ result=`ip addr show | grep $ip`
done