From 5185103692bdae6b4b14fe147c5354354450c1a3 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Thu, 30 Apr 2015 16:13:17 -0700
Subject: [PATCH] Fix to create-test-root-topology.

---
 .gitignore                                      | 13 ++++---------
 root-topology/test/create-test-root-topology.sh |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 27b3e1353..db660e147 100755
--- a/.gitignore
+++ b/.gitignore
@@ -34,13 +34,8 @@
 .qmake.stash
 *.autosave
 /ZeroTier One.dmg
+/root-topology/bin2c
+/root-topology/mktopology
 /root-topology/*.secret
-/testnet/local-testnet/n????
-/testnet/local-testnet/*/peers.persist
-/testnet/local-testnet/*/authtoken.secret
-/testnet/local-testnet/*/*.log
-/testnet/local-testnet/*/*.old
-/testnet/local-testnet/*/root-topology
-/testnet/local-testnet/*/local.conf
-/testnet/local-testnet/*/networks.d
-/netconf/netconf.db
+/root-topology/test/supernodes
+/root-topology/test/test-root-topology
diff --git a/root-topology/test/create-test-root-topology.sh b/root-topology/test/create-test-root-topology.sh
index 032d9c2e5..86c0577cf 100755
--- a/root-topology/test/create-test-root-topology.sh
+++ b/root-topology/test/create-test-root-topology.sh
@@ -11,7 +11,7 @@ rm -rf supernodes
 mkdir supernodes
 
 for cid in `docker ps -f 'name=test-supernode-*' -q`; do
-	id=`docker exec $cid cat /var/lib/zerotier-one/identity.public`
+	id=`docker exec $cid cat /var/lib/zerotier-one/identity.secret | cut -d : -f 1-3`
 	ztaddr=`echo $id | cut -d : -f 1`
 	ip=`docker exec $cid ifconfig | sed -En 's/127.0.0.1//;s/.*inet (addr:)?(([0-9]*\.){3}[0-9]*).*/\2/p'`
 	echo $cid $ztaddr $id $ip