From d6aaecc4a6e43232ba745f946376b385becad5bc Mon Sep 17 00:00:00 2001 From: Noah Zalev Date: Fri, 23 Apr 2021 12:13:43 -0400 Subject: [PATCH 1/2] Add dbname to checkBackupCapability --- db.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db.js b/db.js index 16b1f49f..0beb9018 100644 --- a/db.js +++ b/db.js @@ -1606,7 +1606,8 @@ module.exports.CreateDB = function (parent, func) { cmd += (parent.platform == 'win32') ? ' --password=\"' + props.password + '\"' : ' --password=\'' + props.password + '\''; if (props.host) { cmd += ' -h ' + props.host; } if (props.port) { cmd += ' -P ' + props.port; } - cmd += ' meshcentral > ' + ((parent.platform == 'win32') ? '\"nul\"' : '\"/dev/null\"'); + var dbname = (props.database) ? props.database : 'meshcentral'; + cmd += ' ' + dbname + ' > ' + ((parent.platform == 'win32') ? '\"nul\"' : '\"/dev/null\"'); const child_process = require('child_process'); child_process.exec(cmd, { cwd: backupPath }, function(error, stdout, stdin) { try { From e1636626102fdd3f799abe67a8575d0bc7b6b0f1 Mon Sep 17 00:00:00 2001 From: Noah Zalev Date: Fri, 23 Apr 2021 12:23:58 -0400 Subject: [PATCH 2/2] Added dbname to mysql/mariadb autobackup --- db.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db.js b/db.js index 0beb9018..b5f2d754 100644 --- a/db.js +++ b/db.js @@ -1807,7 +1807,8 @@ module.exports.CreateDB = function (parent, func) { cmd += (parent.platform == 'win32') ? ' --password=\"' + props.password + '\"' : ' --password=\'' + props.password + '\''; if (props.host) { cmd += ' -h ' + props.host; } if (props.port) { cmd += ' -P ' + props.port; } - cmd += ' meshcentral --result-file=\"' + newBackupPath + '.sql\"'; + var sqldbname = (props.database) ? props.database : 'meshcentral'; + cmd += ' ' + sqldbname + ' --result-file=\"' + newBackupPath + '.sql\"'; const child_process = require('child_process'); var backupProcess = child_process.exec(cmd, { cwd: backupPath }, function (error, stdout, stderr) { try {