Browse Source

HPCC-23438 Default Roxie info to linux rather than W2k

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 5 years ago
parent
commit
71126870cd

+ 1 - 1
deployment/deploy/DeploymentEngine.cpp

@@ -1295,7 +1295,7 @@ void CDeploymentEngine::ensurePath(const char* filespec) const
     StringBuffer dir;
     StringBuffer dir;
     splitDirTail(filespec, dir);
     splitDirTail(filespec, dir);
     bool flag = true;
     bool flag = true;
-    EnvMachineOS os = MachineOsW2K;
+    EnvMachineOS os = MachineOsLinux;
 
 
     if (m_curInstance && m_curSSHUser.length() && m_curSSHKeyFile.length())
     if (m_curInstance && m_curSSHUser.length() && m_curSSHKeyFile.length())
     {
     {

+ 1 - 1
initfiles/componentfiles/configxml/RoxieTopology.xsl

@@ -22,7 +22,7 @@
     <xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/>
     <xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/>
     <xsl:template match="text()"/>
     <xsl:template match="text()"/>
     <xsl:param name="process" select="'unknown'"/>
     <xsl:param name="process" select="'unknown'"/>
-    <xsl:param name="isLinuxInstance" select="0"/>
+    <xsl:param name="isLinuxInstance" select="1"/>
     <xsl:param name="outputFilePath"/>
     <xsl:param name="outputFilePath"/>
     <xsl:param name="tempPath" select="'c:\temp\'"/>
     <xsl:param name="tempPath" select="'c:\temp\'"/>