diff --git a/oam/install_scripts/pre-uninstall b/oam/install_scripts/pre-uninstall index 9f99545ce..df8e4771f 100755 --- a/oam/install_scripts/pre-uninstall +++ b/oam/install_scripts/pre-uninstall @@ -82,6 +82,7 @@ $installdir/bin/clearShm > /dev/null 2>&1 rm -f /etc/cron.d/ps > /dev/null 2>&1 rm -f /etc/pscollect > /dev/null 2>&1 /etc/init.d/crond reload > /dev/null 2>&1 +systemctl reload crond.service > /dev/null 2>&1 # delete tmp files rm -f $installdir/local/*.calpont diff --git a/oam/install_scripts/syslogSetup.sh b/oam/install_scripts/syslogSetup.sh index 9492f51db..6d4d1477c 100644 --- a/oam/install_scripts/syslogSetup.sh +++ b/oam/install_scripts/syslogSetup.sh @@ -169,7 +169,9 @@ if [ ! -z "$syslog_conf" ] ; then pkill -hup syslogd > /dev/null 2>&1 pkill -hup syslog-ng > /dev/null 2>&1 + pkill -hup rsyslogd > /dev/null 2>&1 /etc/init.d/rsyslog restart > /dev/null 2>&1 + systemctl restart rsyslog.service > /dev/null 2>&1 fi } @@ -201,6 +203,7 @@ if [ ! -z "$syslog_conf" ] ; then pkill -hup syslogd > /dev/null 2>&1 pkill -hup syslog-ng > /dev/null 2>&1 /etc/init.d/rsyslog restart > /dev/null 2>&1 + systemctl restart rsyslog.service > /dev/null 2>&1 $installdir/bin/setConfig -d Installation SystemLogConfigFile "unassigned" diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp index 354d543ab..fc3ec57f8 100644 --- a/oam/oamcpp/liboamcpp.cpp +++ b/oam/oamcpp/liboamcpp.cpp @@ -7853,6 +7853,13 @@ namespace oam { int user; user = getuid(); + if (user == 0) + cmd = "systemctl " + action + " " + systemlog + ".service > /dev/null 2>&1"; + else + cmd = "sudo systemctl " + action + " " + systemlog + ".service > /dev/null 2>&1"; + + system(cmd.c_str()); + if (user == 0) cmd = "/etc/init.d/" + systemlog + " " + action + " > /dev/null 2>&1"; else diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp index b06a497e8..2553030f4 100644 --- a/procmon/processmonitor.cpp +++ b/procmon/processmonitor.cpp @@ -4163,6 +4163,8 @@ int ProcessMonitor::changeCrontab() // restart the service to make sure it running system("/etc/init.d/crond start > /dev/null 2>&1"); system("/etc/init.d/crond reload > /dev/null 2>&1"); + system("systemctl start crond.service > /dev/null 2>&1"); + system("systemctl reload crond.service > /dev/null 2>&1"); return API_SUCCESS; } @@ -4259,6 +4261,8 @@ int ProcessMonitor::changeTransactionLog() // restart the service to make sure it running system("/etc/init.d/crond start > /dev/null 2>&1"); system("/etc/init.d/crond reload > /dev/null 2>&1"); + system("systemctl start crond.service > /dev/null 2>&1"); + system("systemctl reload crond.service > /dev/null 2>&1"); return API_SUCCESS; } @@ -4296,6 +4300,9 @@ void ProcessMonitor::setTransactionLog(bool action) log.writeLog(__LINE__, "Start and reload crond", LOG_TYPE_DEBUG); system("/etc/init.d/crond start > /dev/null 2>&1"); system("/etc/init.d/crond reload > /dev/null 2>&1"); + system("systemctl start crond.service > /dev/null 2>&1"); + system("systemctl reload crond.service > /dev/null 2>&1"); + } /****************************************************************************************** diff --git a/tools/configMgt/dm_parent_installer.sh b/tools/configMgt/dm_parent_installer.sh index c272bdf30..10f20ae0e 100755 --- a/tools/configMgt/dm_parent_installer.sh +++ b/tools/configMgt/dm_parent_installer.sh @@ -121,7 +121,7 @@ send_user "\n" # install InfiniDB package # send_user "Install New InfiniDB Packages " -send "ssh $USERNAME@$SERVER ' rpm -iv --nodeps $CALPONTPACKAGE1 $CALPONTPACKAGE2 $CALPONTPACKAGE3 $MYSQLPACKAGE $MYSQLDPACKAGE'\n" +send "ssh $USERNAME@$SERVER ' rpm -ivh --nodeps infinidb-mariadb*'\n" expect -re "word: " # password for ssh send "$PASSWORD\n" diff --git a/tools/configMgt/pm_parent_installer.sh b/tools/configMgt/pm_parent_installer.sh index 848480eb7..b62b5598d 100755 --- a/tools/configMgt/pm_parent_installer.sh +++ b/tools/configMgt/pm_parent_installer.sh @@ -111,7 +111,7 @@ sleep 5 # set timeout 160 send_user "Install New InfiniDB Packages " -send "ssh $USERNAME@$SERVER ' rpm -ivh --nodeps $CALPONTPACKAGE1 $CALPONTPACKAGE2 $CALPONTPACKAGE3'\n" +send "ssh $USERNAME@$SERVER ' rpm -ivh --nodeps infinidb-mariadb*'\n" expect -re "word: " # password for ssh send "$PASSWORD\n"