|
|
|
@ -69,8 +69,8 @@ class fillVars(object, glob_attr):
|
|
|
|
|
actionsMap = {'merge':'up',
|
|
|
|
|
'system':'up'}
|
|
|
|
|
cl_action = self.Get('cl_action')
|
|
|
|
|
clRootType = self.Get('os_install_root_type')
|
|
|
|
|
if cl_action == "system" and clRootType == "flash":
|
|
|
|
|
if cl_action == 'system' and \
|
|
|
|
|
self.Get('os_install_root_type') == 'flash':
|
|
|
|
|
return ""
|
|
|
|
|
return actionsMap[cl_action] if cl_action in actionsMap else ""
|
|
|
|
|
|
|
|
|
@ -88,8 +88,7 @@ class fillVars(object, glob_attr):
|
|
|
|
|
"""Need perform templates for install:flash"""
|
|
|
|
|
actionsMap = {'system':'up'}
|
|
|
|
|
clAction = self.Get('cl_action')
|
|
|
|
|
clRootType = self.Get('os_install_root_type')
|
|
|
|
|
if clAction == 'system' and clRootType == 'flash':
|
|
|
|
|
if clAction == 'system' and self.Get('os_install_root_type') == 'flash':
|
|
|
|
|
return "up"
|
|
|
|
|
return ""
|
|
|
|
|
|
|
|
|
|