diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp index 8ea9af62f..55f91b2e6 100644 --- a/oamapps/postConfigure/installer.cpp +++ b/oamapps/postConfigure/installer.cpp @@ -99,6 +99,7 @@ int main(int argc, char *argv[]) string nodeps = "-h"; string installer_debug = "0"; string packageType = "rpm"; + string managePackages = "1"; Config* sysConfig = Config::makeConfig(); string SystemSection = "SystemConfig"; @@ -383,6 +384,16 @@ int main(int argc, char *argv[]) exit(1); } + //Have we to manage packages ? + try{ + managePackages = sysConfig->getConfig(InstallSection, "managePackages"); + } + catch(...) + { + cout << "ERROR: Problem getting managePackages" << endl; + exit(1); + } + //get Parent OAM Module Name and setup of it's Custom OS files string parentOAMModuleName; try{ @@ -555,7 +566,7 @@ int main(int argc, char *argv[]) temppwprompt = "none"; cout << endl << "----- Performing Uninstall on Module '" + remoteModuleName + "' -----" << endl << endl; - cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + calpont_rpm1 + " " + calpont_rpm2 + " " + calpont_rpm3 + " " + mysql_rpm + " " + mysqld_rpm + " " + installType + " " + packageType + " " + nodeps + " " + temppwprompt + " " + installer_debug; + cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + calpont_rpm1 + " " + calpont_rpm2 + " " + calpont_rpm3 + " " + mysql_rpm + " " + mysqld_rpm + " " + installType + " " + packageType + " " + nodeps + " " + temppwprompt + " " + installer_debug + " " + managePackages; int rtnCode = system(cmd.c_str()); if (WEXITSTATUS(rtnCode) != 0) { cout << endl << "ERROR: returned from user_installer.sh" << endl; @@ -649,7 +660,7 @@ int main(int argc, char *argv[]) temppwprompt = "none"; cout << endl << "----- Performing Install on Module '" + remoteModuleName + "' -----" << endl << endl; - cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + calpont_rpm1 + " " + calpont_rpm2 + " " + calpont_rpm3 + " " + mysql_rpm + " " + mysqld_rpm + " " + installType + " " + packageType + " " + nodeps + " " + temppwprompt + " " + installer_debug; + cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + calpont_rpm1 + " " + calpont_rpm2 + " " + calpont_rpm3 + " " + mysql_rpm + " " + mysqld_rpm + " " + installType + " " + packageType + " " + nodeps + " " + temppwprompt + " " + installer_debug + managePackages; int rtnCode = system(cmd.c_str()); if (WEXITSTATUS(rtnCode) != 0) { cout << endl << "ERROR returned from user_installer.sh" << endl; diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp index 8dedf915d..ed62ba815 100644 --- a/procmgr/processmanager.cpp +++ b/procmgr/processmanager.cpp @@ -4484,8 +4484,10 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str string systemID; string packageType = "rpm"; + string managePackages = "1"; oam.getSystemConfig("EEPackageType", packageType); + oam.getSystemConfig("managePackages", managePackages); // // check for RPM package @@ -5063,7 +5065,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str if ( packageType != "binary" ) { log.writeLog(__LINE__, "addModule - user_installer run for " + remoteModuleName, LOG_TYPE_DEBUG); - string cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + version + " initial " + packageType + " --nodeps none " + MySQLPort + " 1 > /tmp/user_installer.log"; + string cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + version + " initial " + packageType + " --nodeps none " + MySQLPort + " 1 " + managePackages + " > /tmp/user_installer.log"; log.writeLog(__LINE__, "addModule cmd: " + cmd, LOG_TYPE_DEBUG);