From d07b4931316b671b941a777e6182ad8b37af56aa Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Thu, 9 Jul 2020 17:14:49 +0200 Subject: [PATCH] bkctld-update: start jail after upgrade if it was started before --- CHANGELOG.md | 2 ++ lib/bkctld-update | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0687b48..54e9300 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +* bkctld-update: start jail after upgrade if it was started before + ### Deprecated ### Removed diff --git a/lib/bkctld-update b/lib/bkctld-update index c5b4ec2..bc64af2 100755 --- a/lib/bkctld-update +++ b/lib/bkctld-update @@ -15,8 +15,24 @@ jail_path=$(jail_path "${jail_name}") test -d "${jail_path}" || error "${jail_name}: jail not found" 2 -"${LIBDIR}/bkctld-is-on" "${jail_name}" && "${LIBDIR}/bkctld-stop" "${jail_name}" +"${LIBDIR}/bkctld-is-on" "${jail_name}" 2>/dev/null +case "$?" in + 0) + jail_initial_status="on" + ;; + 100) + jail_initial_status="off" + ;; + *) + unset jail_initial_status + error "Error evaluating jail \`${jail_name}' state. bkctld-is-on exited with \`$?'" + ;; +esac + +test "${jail_initial_status}" = "on" && "${LIBDIR}/bkctld-stop" "${jail_name}" setup_jail_chroot "${jail_name}" +test "${jail_initial_status}" = "on" && "${LIBDIR}/bkctld-start" "${jail_name}" + notice "Update jail \`${jail_name}' : OK"