linhes-config: clean up etc/fstab (pts shm)

added service to list of things to unsquash .upgrades from CD will now work
Converted most calls to the systemconfig dict to use .get.  This will stop KEYERRORS form occuring.

1 files changed, 12 insertions, 12 deletions

diff --git a/abs/core/LinHES-config/systemconfig.py b/abs/core/LinHES-config/systemconfig.py
index c1d780d..3cba427 100755
--- a/abs/core/LinHES-config/systemconfig.py
+++ b/abs/core/LinHES-config/systemconfig.py
@@ -42,13 +42,13 @@ def setup_x(systemconfig):
 	if not os.path.exists('/usr/share/icons/default'):
 		if os.path.exists('/usr/share/icons/whiteglass'):
  	            os.symlink('/usr/share/icons/whiteglass','/usr/share/icons/default');
-        if systemconfig["UseXLargeMouse"] == "1" :
+        if systemconfig.get("UseXLargeMouse") == "1" :
             cmd = "echo Xcursor.size: 48 > %s/.Xdefaults" %data_config.MYTHHOME
         else:
             cmd = "echo Xcursor.size: 16 > %s/.Xdefaults" %data_config.MYTHHOME
         mv_common.runcmd(cmd)
 
-        cmd = "%s/bin/xconfig.sh" %systemconfig["MVROOT"]
+        cmd = "%s/bin/xconfig.sh" %systemconfig.get("MVROOT")
         mv_common.runcmd(cmd)
 
 def main(argv):
@@ -140,8 +140,8 @@ def main(argv):
             logging.info("____Skipping of Audio, config disabled____")
         else:
             logging.debug("______Start of Audio Configuration______")
-            if not systemconfig["Audiotype"] == "tinker":
-                cmd="%s/bin/soundconfig.sh -t real -i %s -d %s" %(MVROOT,systemconfig["Audiotype"],systemconfig["SoundDevice"])
+            if not systemconfig.get("Audiotype") == "tinker":
+                cmd="%s/bin/soundconfig.sh -t real -i %s -d %s" %(MVROOT,systemconfig.get("Audiotype"),systemconfig["SoundDevice"])
                 mv_common.runcmd(cmd)
             else:
                 logging.debug("    Tinker mode(audio), not changing configuration")
@@ -153,8 +153,8 @@ def main(argv):
         else:
             import mv_misc
 	    #zipcode is no longer used
-            #mv_misc.setup_zip(MVROOT,systemconfig["zipcode"])
-            mv_misc.setup_tz(systemconfig["timezone"],systemconfig["TEMPLATES"])
+            #mv_misc.setup_zip(MVROOT,systemconfig.get("zipcode"))
+            mv_misc.setup_tz(systemconfig.get("timezone"),systemconfig["TEMPLATES"])
             mv_misc.setup_nfs(systemconfig)
 
     if cmdmodule["sleep"]:
@@ -166,7 +166,7 @@ def main(argv):
 
     if cmdmodule["webuser"]:
         import mv_webuser
-        mv_webuser.setup_web_auth(systemconfig["UseMythWEB_auth"])
+        mv_webuser.setup_web_auth(systemconfig.get("UseMythWEB_auth"))
 
     if cmdmodule["ddns"]:
         import mv_ddns
@@ -194,19 +194,19 @@ def main(argv):
         mv_common.restartfe(restartlcd)
 
     if cmdmodule["reloadfe"]:
-        mv_common.reloadfe(systemconfig["dbhost"],restartlcd)
+        mv_common.reloadfe(systemconfig.get("dbhost"),restartlcd)
 
     if cmdmodule["smolt"]:
         import mv_smolt
-        mv_smolt.setup_smolt_type(systemconfig["SystemType"],
-                                  systemconfig["Remotetype"],
-                                  systemconfig["RunFrontend"],
+        mv_smolt.setup_smolt_type(systemconfig.get("SystemType"),
+                                  systemconfig.get("Remotetype"),
+                                  systemconfig.get("RunFrontend"),
                                   data_config.MYTHHOME,
                                   data_config.SYSTEMTYPE)
 
     if cmdmodule["user"]:
         logging.info("____Start of ssh user____")
-        if systemconfig["rootSSH"] == "1" :
+        if systemconfig.get("rootSSH") == "1" :
             logging.info("    Allowing ssh access for root")
             cmd = '''sed -i "s/^.*PermitRootLogin.*$/PermitRootLogin yes/" /etc/ssh/sshd_config'''
             mv_common.runcmd(cmd)