Package up 'tty'

diff --git a/config.json b/config.json
index 5594855812035673c914791050c06143439970b6..b1268633bade80bbfb0fe33ac792c22aabd78ddb 100644 (file)
--- a/config.json
+++ b/config.json
@@ -2,8 +2,10 @@
        "servers": {
                "web2": {
                        "manager": "myboard",
-                       "tty": "/dev/ttyUSB0",
-                       "baud": 115200
+                       "tty": {
+                               "file": "/dev/ttyUSB0",
+                               "baud": 115200
+                       }
                }
        },
        "managers": {

diff --git a/libremanage.py b/libremanage.py
index f0375a326a3205fb16787da62fb227bda6ea41fa..87cb48832bdfc32f6340cc4ecce723b036cd5dd0 100644 (file)
--- a/libremanage.py
+++ b/libremanage.py
@@ -72,7 +72,7 @@ COMMANDS = {
 
         # TTY access (or keyboard if wired as such)
 
-        "tty": lambda s: open_ssh(s, "screen " + s["tty"] + str(s["baud"])),
+        "tty": lambda s: open_ssh(s, "screen " + s["tty"]["file"] + str(s["tty"]["baud"])),
 
         # SSH sanity tests