Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONOS
diff --git a/scripts/all-linkup-hw.sh b/scripts/all-linkup-hw.sh
new file mode 100755
index 0000000..41d6be8
--- /dev/null
+++ b/scripts/all-linkup-hw.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+# BRINGS BACK UP ALL THE LINKS FOR THE HARDWARE DEMO AS SHOWN IN ONS 2013
+# link-hw.sh %s %s %s % (src_dpid, port1, cmd)
+
+./link-hw.sh 00:00:00:00:ba:5e:ba:11 24 up
+./link-hw.sh 00:00:00:00:ba:5e:ba:11 23 up
+
+./link-hw.sh 00:00:00:00:ba:5e:ba:13 22 up
+./link-hw.sh 00:00:00:00:ba:5e:ba:13 23 up
+
+./link-hw.sh 00:00:00:00:00:00:ba:12 23 up
+./link-hw.sh 00:00:00:00:00:00:ba:12 22 up
+./link-hw.sh 00:00:00:00:00:00:ba:12 24 up
+
+./link-hw.sh 00:01:00:16:97:08:9a:46 23 up
+./link-hw.sh 00:01:00:16:97:08:9a:46 24 up
+
+./link-hw.sh 00:00:20:4e:7f:51:8a:35 21 up
+./link-hw.sh 00:00:20:4e:7f:51:8a:35 22 up
+./link-hw.sh 00:00:20:4e:7f:51:8a:35 24 up
+./link-hw.sh 00:00:20:4e:7f:51:8a:35 23 up
diff --git a/scripts/neclink.exp b/scripts/neclink.exp
index a09ed11..0815843 100755
--- a/scripts/neclink.exp
+++ b/scripts/neclink.exp
@@ -1,6 +1,6 @@
#!/usr/bin/expect -f
# ./neclink.exp <ip of port> <'no' or blank>
-set timeout -1
+set timeout 5
set port [lindex $argv 0]
set no [lindex $argv 1]
diff --git a/scripts/prontolink.exp b/scripts/prontolink.exp
index 7786701..501cccd 100755
--- a/scripts/prontolink.exp
+++ b/scripts/prontolink.exp
@@ -1,6 +1,6 @@
#!/usr/bin/expect -f
# ./prontolink.exp <ip of switch> <port> <0 or 1 (on or off)>
-set timeout -1
+set timeout 5
set arg0 [lindex $argv 0]
set port [lindex $argv 1]
set onoff [lindex $argv 2]