evolix/evobackup
22
0
Fork 1
Code Issues 28 Pull requests 5 Releases 21 Activity

Merge branch 'master' into debian

Browse source
This commit is contained in:
Jérémy Lecour 2021-06-30 18:15:04 +02:00 committed by Jérémy Lecour
parent 65368a7604 d6dd91eb1f
commit 32e5157e48
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -18,6 +18,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Security ### Security
## [2.11.1] - 2021-06-30
### Changed
* bkctld-rename: abort operation if incs exist with the new name
## [2.11.0] - 2021-06-29 ## [2.11.0] - 2021-06-29
### Changed ### Changed

2
lib/bkctld-rename
View file

@ -14,6 +14,7 @@ new_jail_name="${2:?}"
if [ -z "${jail_name}" ] || [ -z "${new_jail_name}" ]; then if [ -z "${jail_name}" ] || [ -z "${new_jail_name}" ]; then
show_help && exit 1 show_help && exit 1
fi fi
jail_path=$(jail_path "${jail_name}") jail_path=$(jail_path "${jail_name}")
incs_path=$(incs_path "${jail_name}") incs_path=$(incs_path "${jail_name}")
jail_config_dir=$(jail_config_dir "${jail_name}") jail_config_dir=$(jail_config_dir "${jail_name}")
@ -27,6 +28,7 @@ new_jail_config_dir=$(jail_config_dir "${new_jail_name}")
new_legacy_config_file="${CONFDIR}/${new_jail_name}" new_legacy_config_file="${CONFDIR}/${new_jail_name}"
test -d "${new_jail_path}" && error "${new_jail_name}: jail already exists" 2 test -d "${new_jail_path}" && error "${new_jail_name}: jail already exists" 2
test -d "${new_incs_path}" && error "${new_jail_name}: incs already exists" 2
"${LIBDIR}/bkctld-is-on" "${jail_name}" 2>/dev/null "${LIBDIR}/bkctld-is-on" "${jail_name}" 2>/dev/null
case "$?" in case "$?" in

2
lib/includes
View file

@ -6,7 +6,7 @@
[ -f /etc/default/bkctld ] && . /etc/default/bkctld [ -f /etc/default/bkctld ] && . /etc/default/bkctld
VERSION="2.11.0" VERSION="2.11.1"
LIBDIR=${LIBDIR:-/usr/lib/bkctld} LIBDIR=${LIBDIR:-/usr/lib/bkctld}
CONFDIR="${CONFDIR:-/etc/evobackup}" CONFDIR="${CONFDIR:-/etc/evobackup}"