From 57ee86d251100d9f7a3ca5c39971b8848dfa0b5c Mon Sep 17 00:00:00 2001
From: Jerry Seutter <jseutter@gmail.com>
Date: Thu, 30 Oct 2014 17:15:59 -0600
Subject: [PATCH] Fix bug where images not found Improve ssh_to_server script.

---
 gns3/cloud/utils.py      |  2 +-
 scripts/ssh_to_server.py | 28 +++++++++++++++++-----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/gns3/cloud/utils.py b/gns3/cloud/utils.py
index 974ddc0a..87293362 100644
--- a/gns3/cloud/utils.py
+++ b/gns3/cloud/utils.py
@@ -138,7 +138,7 @@ DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confnew" --fo
 DEBIAN_FRONTEND=noninteractive apt-get -y install git python3-setuptools python3-netifaces python3-pip python3-zmq dynamips
 mkdir -p /opt/gns3
 cd /opt/gns3; git clone https://github.com/planctechnologies/gns3-server.git
-cd /opt/gns3/gns3-server; git checkout gns-110; git pull
+cd /opt/gns3/gns3-server; git checkout dev; git pull
 cd /opt/gns3/gns3-server; pip3 install -r dev-requirements.txt
 cd /opt/gns3/gns3-server; python3 ./setup.py install
 ln -sf /usr/bin/dynamips /usr/local/bin/dynamips
diff --git a/scripts/ssh_to_server.py b/scripts/ssh_to_server.py
index 2047cc66..dbf124a2 100644
--- a/scripts/ssh_to_server.py
+++ b/scripts/ssh_to_server.py
@@ -23,7 +23,11 @@ app.setApplicationName("GNS3")
 
 settings = QtCore.QSettings()
 
-print('Reading config from {}'.format(QtCore.QSettings().fileName()))
+if not os.path.isfile(QtCore.QSettings().fileName()):
+    print('Config file {} not found! Aborting...'.format(QtCore.QSettings().fileName()))
+    sys.exit(1)
+
+print('Reading config file {}...'.format(QtCore.QSettings().fileName()))
 
 def read_cloud_settings():
     settings = QtCore.QSettings()
@@ -45,15 +49,17 @@ def read_cloud_settings():
 
 name, host, private_key, public_key = read_cloud_settings()
 
-print(name)
-print(host)
-print(private_key)
-print(public_key)
+print('Instance name: {}'.format(name))
+print('Host ip: {}'.format(host))
 
-
-open('/tmp/id_rsa.pub', 'w').write(public_key)
-open('/tmp/id_rsa', 'w').write(private_key)
-os.system('chmod 0600 /tmp/id_rsa')
-
-cmd = 'ssh -i /tmp/id_rsa root@{}'.format(host) 
+public_key_path = '/tmp/id_rsa.pub'
+open(public_key_path, 'w').write(public_key)
+private_key_path = '/tmp/id_rsa'
+open(private_key_path, 'w').write(private_key)
+cmd = 'chmod 0600 {}'.format(private_key_path)
+os.system(cmd)
+print('Per-instance ssh keys written to {}'.format(private_key_path))
+
+cmd = 'ssh -i /tmp/id_rsa root@{}'.format(host)
+print(cmd)
 os.system(cmd)