database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-11-02 06:13:16 +03:00
Code Activity

Add managePackages as parameter for user_installer.sh calls

Browse Source
This commit is contained in:
Jean Baptiste Favre
2017-02-15 15:57:08 +01:00
parent 4756059525
commit b2db4ac7dc
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
oamapps/postConfigure/installer.cpp
View File

@@ -568,9 +568,9 @@ int main(int argc, char *argv[])
cout << endl << "----- Performing Uninstall on Module '" + remoteModuleName + "' -----" << endl << endl; cout << endl << "----- Performing Uninstall on Module '" + remoteModuleName + "' -----" << endl << endl;
cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " +
password + " " + calpont_rpm1 + " " + calpont_rpm2 + " " + calpont_rpm3 + " " + mysql_rpm + password + " " + calpont_rpm1 + " " + calpont_rpm2 + " " + calpont_rpm3 + " " + mysql_rpm +
" " + mysqld_rpm + " " + installType + " " + packageType + " " + nodeps + " " + temppwprompt + " " + mysqld_rpm + " " + installType + " " + packageType + " " + nodeps + " " + temppwprompt +
" " + installer_debug + " " + managePackages; " " + installer_debug + " " + managePackages;
int rtnCode = system(cmd.c_str()); int rtnCode = system(cmd.c_str());
if (WEXITSTATUS(rtnCode) != 0) { if (WEXITSTATUS(rtnCode) != 0) {
cout << endl << "ERROR: returned from user_installer.sh" << endl; 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; cout << endl << "----- Performing Install on Module '" + remoteModuleName + "' -----" << endl << endl;
cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password +
" " + calpont_rpm1 + " " + calpont_rpm2 + " " + calpont_rpm3 + " " + mysql_rpm + " " + " " + calpont_rpm1 + " " + calpont_rpm2 + " " + calpont_rpm3 + " " + mysql_rpm + " " +
mysqld_rpm + " " + installType + " " + packageType + " " + nodeps + " " + temppwprompt + mysqld_rpm + " " + installType + " " + packageType + " " + nodeps + " " + temppwprompt +
" " + installer_debug + managePackages; " " + installer_debug + managePackages;
int rtnCode = system(cmd.c_str()); int rtnCode = system(cmd.c_str());
if (WEXITSTATUS(rtnCode) != 0) { if (WEXITSTATUS(rtnCode) != 0) {
cout << endl << "ERROR returned from user_installer.sh" << endl; cout << endl << "ERROR returned from user_installer.sh" << endl;

2
procmgr/processmanager.cpp
View File

@@ -5066,7 +5066,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
log.writeLog(__LINE__, "addModule - user_installer run for " + remoteModuleName, LOG_TYPE_DEBUG); log.writeLog(__LINE__, "addModule - user_installer run for " + remoteModuleName, LOG_TYPE_DEBUG);
string cmd = installDir + "/bin/user_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + 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); log.writeLog(__LINE__, "addModule cmd: " + cmd, LOG_TYPE_DEBUG);