Add HostKeyAlias to the list of supported ssh options

build/Makefile

@@ -1,7 +1,7 @@
 #############################################################################
 # Copyright (c) 2017 SiteWare Corp. All right reserved
 #############################################################################
-SD2_VERSION := 0.9.84
+SD2_VERSION := 0.9.85
 
 TOP := $(realpath ..)
 SD2OS := $(shell uname)

build/check_code_style.py

@@ -21,7 +21,8 @@
     # Sigh there is no way to make a string multiline in json
     if filepath.endswith('.json'):
         continue
-    if len(line) > 100:
+    if (len(line) > 100 and
+        line.strip()[0] != '#'):
         sys.stderr.write(
             "{}:{} is too long\n".format(sys.argv[1], ii+1))
         sys.exit(1)

src/lib/sd2/gen_interfaces.py

@@ -17,6 +17,8 @@ def gen_interfaces(hostname=None):
     if hostplatform == 'Darwin':
         cmd = "sudo ifconfig lo0 alias {}"
     elif hostplatform == 'Linux':
+        # See https://unix.stackexchange.com/questions/140231/whats-the-exact-behaviour-of-the-command-ip-address-change
+        # We do replace instead of add so that is succeeds every time
         cmd = "sudo ip addr replace {} dev lo"
     else:
         sys.stderr.write('Unsupported platform ' + hostplatform)

src/lib/sd2/gen_ssh_config.py

@@ -44,6 +44,7 @@
     'ProxyJump',
     "PKCS11Provider",
     'SmartcardDevice',
+    'HostKeyAlias'
 ]
 ssh_option_names.extend(container_ssh_option_names)
 

src/lib/sd2/sd2_config_schema.json

@@ -63,6 +63,7 @@
         "ServerAliveInterval": {"type": "integer"},
         "PKCS11Provider": {"type": "string"},
         "SmartcardDevice": {"type": "string"},
+        "HostKeyAlias": {"type": "string"},
         "LocalForward": {
           "type": "array",
           "items": {