cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 29ba71f
Date Wed, 04 May 2016 14:29:39 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master ccb4fe0e7 -> 29ba71f2d


CLOUDSTACK-9336 surround the execution of baremetal-vr.py with condition

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2a88b111
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2a88b111
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2a88b111

Branch: refs/heads/master
Commit: 2a88b11132780a2adba63de519e4c459ee7c3cea
Parents: 419f8fb
Author: dahn <daan@onecht.net>
Authored: Tue Apr 5 13:28:39 2016 +0200
Committer: dahn <daan@onecht.net>
Committed: Tue Apr 5 13:28:39 2016 +0200

----------------------------------------------------------------------
 systemvm/patches/debian/config/etc/rc.local | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2a88b111/systemvm/patches/debian/config/etc/rc.local
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/rc.local b/systemvm/patches/debian/config/etc/rc.local
index 18e7cd1..3b19218 100755
--- a/systemvm/patches/debian/config/etc/rc.local
+++ b/systemvm/patches/debian/config/etc/rc.local
@@ -42,7 +42,10 @@ then
    echo 1000000 > /proc/sys/net/nf_conntrack_max
 fi
 
-python /opt/cloud/bin/baremetal-vr.py &
+if [ "$router" != "" ]
+then
+    python /opt/cloud/bin/baremetal-vr.py &
+fi
 
 date > /var/cache/cloud/boot_up_done
 logger -t cloud "Boot up process done"


Mime
View raw message