|
|
@@ -1710,10 +1710,13 @@ bool CVtmLoaderFSM::GetConfig()
|
|
|
DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("before GetConfig terminalNo:[%s]", m_sysInfo.strTerminalID.GetData());
|
|
|
//拉取配置前先检查root.ini文件
|
|
|
CSimpleStringA csTmpRootIni("");
|
|
|
- if (!IsRootINIExist(csTmpRootIni) && m_terminalNoFromWeb.IsNullOrEmpty())
|
|
|
+ if (!IsRootINIExist(csTmpRootIni))
|
|
|
{
|
|
|
- LogWarn(Severity_High, Error_Unexpect, VtmLoader_BootInfoPrint, CSimpleStringA::Format("root.ini不存在或安装页面未设置终端号,请检查(%s)", csTmpRootIni.GetData()).GetData());
|
|
|
- return false;
|
|
|
+ if (m_terminalNoFromWeb.IsNullOrEmpty())
|
|
|
+ {
|
|
|
+ LogWarn(Severity_High, Error_Unexpect, VtmLoader_BootInfoPrint, CSimpleStringA::Format("安装页面未设置终端号,请检查(%s)", csTmpRootIni.GetData()).GetData());
|
|
|
+ return false;
|
|
|
+ }
|
|
|
}
|
|
|
else if (m_sysInfo.strTerminalID.IsNullOrEmpty())
|
|
|
{
|