From b2db4ac7dc8a689c36c850e5636b83eb569f34ad Mon Sep 17 00:00:00 2001 From: Jean Baptiste Favre Date: Wed, 15 Feb 2017 15:57:08 +0100 Subject: [PATCH] Add managePackages as parameter for user_installer.sh calls --- oamapps/postConfigure/installer.cpp | 12 ++++++------ procmgr/processmanager.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp index 1e0a7c3a0..ccda382bc 100644 --- a/oamapps/postConfigure/installer.cpp +++ b/oamapps/postConfigure/installer.cpp @@ -568,9 +568,9 @@ int main(int argc, char *argv[]) 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 + " " + managePackages; + 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; @@ -665,9 +665,9 @@ int main(int argc, char *argv[]) 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 + managePackages; + " " + 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 0f3ea1c67..f5e0bd239 100644 --- a/procmgr/processmanager.cpp +++ b/procmgr/processmanager.cpp @@ -5066,7 +5066,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str 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 " + managePackages + " > /tmp/user_installer.log"; + " " + version + " initial " + packageType + " --nodeps none " + MySQLPort + " 1 " + managePackages + " > /tmp/user_installer.log"; log.writeLog(__LINE__, "addModule cmd: " + cmd, LOG_TYPE_DEBUG);