Merge branch '2.0' into 2.1

This commit is contained in:
Julien Duponchelle committed 2017-03-30 10:16:16 +02:00
commit 4f1b738ef5
275 files changed
+5384 -272

No files matched your search

-2
View File
@@ -31,9 +31,7 @@ function help {
}
function log {
tput setaf 2
echo "=> $1" >&2
tput sgr0
}
lsb_release -d | grep "LTS" > /dev/null
+17
View File
@@ -0,0 +1,17 @@
#!/bin/bash
# This script will push current dev to a GNS3 VM and
# will also start the server in console
SERVER_ADDRESS=$1
if [ "$SERVER_ADDRESS" == "" ]
then
echo "usage: run_on_gns3vm.sh VM_IP"
exit 1
fi
ssh gns3@$SERVER_ADDRESS "sudo service gns3 stop"
rsync -avz --exclude==".git/*" --exclude=='docs/*' --exclude="__pycache__" --exclude=='tests/*' . "gns3@$SERVER_ADDRESS:gns3server"
ssh gns3@$SERVER_ADDRESS "killall python3;cd gns3server;python3 -m gns3server"