Fix variables

install/variables/distr.py

@@ -364,7 +364,7 @@ class VariableClImageLinuxShortname(Variable,Linux,DistroRepository):
     Filter by shortname
     """
     value = ""
-    type = 'choice'
+    type = 'choiceedit'
     metavalue = "SYSTEM"
     opt = ['--os','-s']
 

install/variables/system.py

@@ -537,17 +537,24 @@ class VariableClTemplatesLocate(Variable):
     metavalue = "TEMPLATES"
     untrusted = True
 
+    descriptionMap = {'overlay':_('Overlay templates'),
+                     'local':_('Local templates'),
+                     'remote':_('Remote templates'),
+                     'clt':_('clt templates')}
+
     def init(self):
         self.label = _("Location templates")
         self.help = _("select location for templates %s") \
-                      %"'overlay','local','remote','clt'"
+                      %",".join(self.get())
+
+    def get(self):
+        vals = \
+            self.Get('cl_template_location')[:len(self.Get('cl_template_path'))]
+        return vals + ['clt']
 
     def choice(self):
-        return [
-		('overlay',_('Overlay templates')),
-		('local',_('Local templates')),
-		('remote',_('Remote templates')),
-		('clt',_('clt templates'))]
+        return map(lambda x:self.descriptionMap.get(x,x),
+               self.get())
 
 class VariableOsInstallPxe(ReadonlyVariable):
     """