diff --git a/CHANGELOG.md b/CHANGELOG.md index cb3e69c..a743dcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Security +## [2.5.1] - 2020-10-07 + +### Changed + +* bkctld: Replace xargs with a simple loop + ## [2.5.0] - 2020-09-25 ### Fixed diff --git a/bkctld b/bkctld index 353773b..864b4ed 100755 --- a/bkctld +++ b/bkctld @@ -76,7 +76,9 @@ case "${subcommand}" in "start" | "stop" | "reload" | "restart" | "sync" | "update" | "remove" | "firewall" | "upgrade-config") jail_name="${2:-}" if [ "${jail_name}" = "all" ]; then - "${LIBDIR}/bkctld-list" | xargs --no-run-if-empty --max-args=1 --max-procs=0 "${LIBDIR}/bkctld-${subcommand}" + for jail in $("${LIBDIR}/bkctld-list"); do + "${LIBDIR}/bkctld-${subcommand}" "${jail}" + done elif [ -z "${jail_name}" ]; then "${LIBDIR}/bkctld-help" exit 1 @@ -87,7 +89,9 @@ case "${subcommand}" in "status") jail_name="${2:-}" if [ "${jail_name}" = "all" ] || [ -z "${jail_name}" ]; then - "${LIBDIR}/bkctld-list" | xargs --no-run-if-empty --max-args=1 "${LIBDIR}/bkctld-${subcommand}" + for jail in $("${LIBDIR}/bkctld-list"); do + "${LIBDIR}/bkctld-${subcommand}" "${jail}" + done else "${LIBDIR}/bkctld-${subcommand}" "${jail_name}" fi diff --git a/zzz_evobackup b/zzz_evobackup index d0f4f57..b38afc2 100755 --- a/zzz_evobackup +++ b/zzz_evobackup @@ -156,9 +156,9 @@ if [ "${LOCAL_TASKS}" = "1" ]; then ## example with two dumps for each table (.sql/.txt) for all databases # for i in $(echo SHOW DATABASES | mysql --defaults-extra-file=/etc/mysql/debian.cnf -P 3306 \ # | egrep -v "^(Database|information_schema|performance_schema|sys)" ); \ - # do mkdir -p -m 700 ${LOCAL_BACKUP_DIR}/mysql/$i ; chown -RL mysql /home/mysqldump ; \ + # do mkdir -p -m 700 /home/mysqldump/$i ; chown -RL mysql /home/mysqldump ; \ # mysqldump --defaults-extra-file=/etc/mysql/debian.cnf --force -P 3306 -Q --opt --events --hex-blob --skip-comments \ - # --fields-enclosed-by='\"' --fields-terminated-by=',' -T ${LOCAL_BACKUP_DIR}/mysql/$i $i; done + # --fields-enclosed-by='\"' --fields-terminated-by=',' -T /home/mysqldump/$i $i; done ## Dump all grants (requires 'percona-toolkit' package) # mkdir -p -m 700 ${LOCAL_BACKUP_DIR}/mysql/