preserve additional read-only config when using the cache

diff --git a/src/config.py b/src/config.py
index 39634bf560d24df1c3d2b6bd68fdd78c4f015170..eee074c324b38c7efbf28ccb9009b0e4c9c1913b 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -123,6 +123,8 @@ def set_main(main_config):
     
     main_config = dict(main_config)
     _set_default_motion(main_config, old_motion=is_old_motion())
+    for n, v in _main_config_cache.iteritems():
+        main_config.setdefault(n, v)
     _main_config_cache = main_config
     
     main_config = dict(main_config)
@@ -1610,7 +1612,7 @@ def _get_additional_config(data, camera):
 
 def _set_additional_config(data, camera):
     (sections, configs) = get_additional_structure(camera)
-
+    
     set_func_values = {}
     for name, section in sections.iteritems():
         if not section.get('set'):

diff --git a/src/wifictl.py b/src/wifictl.py
index 846d437c6949a76dfc95fe2b15274702ff30c744..32ec562d47bc23c089c41c6284362a265e015cfd 100644 (file)
--- a/src/wifictl.py
+++ b/src/wifictl.py
@@ -93,7 +93,7 @@ def _set_wifi_settings(s):
     s.setdefault('wifiNetworkName', '')
     s.setdefault('wifiNetworkKey', '')
     
-    logging.debug('writing wifi settings to %s: enabled=%s, psk="%s"' % (
+    logging.debug('writing wifi settings to %s: enabled=%s, ssid="%s"' % (
             WPA_SUPPLICANT_CONF, s['wifiEnabled'], s['wifiNetworkName']))
 
     enabled = s['wifiEnabled']