From 49fff6e85d863a55e933e5f1edd745617d648856 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Tue, 29 Jun 2021 07:53:38 +0200
Subject: [PATCH] bkctld-rename: reset firewall rules and fix logic error

---
 lib/bkctld-rename | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/bkctld-rename b/lib/bkctld-rename
index fc44f91..2147a13 100755
--- a/lib/bkctld-rename
+++ b/lib/bkctld-rename
@@ -46,16 +46,23 @@ test "${jail_initial_status}" = "on" && "${LIBDIR}/bkctld-stop" "${jail_name}"
 
 if dry_run; then
     echo "[dry-run] rename ${jail_path} to ${new_jail_path}"
-    echo "[dry-run] rename ${incs_path} to ${new_incs_path}"
 else
     mv "${jail_path}" "${new_jail_path}"
-    mv "${incs_path}" "${new_incs_path}"
+fi
+if dry_run; then
+    if [ -d "${incs_path}" ]; then
+        echo "[dry-run] rename ${incs_path} to ${new_incs_path}"
+    fi
+else
+    if [ -d "${incs_path}" ]; then
+        mv "${incs_path}" "${new_incs_path}"
+    fi
 fi
 if [ -d "${jail_config_dir}" ]; then
     if dry_run; then
-        mv "${jail_config_dir}" "${new_jail_config_dir}"
-    else
         echo "[dry-run] rename ${jail_config_dir} to ${new_jail_config_dir}"
+    else
+        mv "${jail_config_dir}" "${new_jail_config_dir}"
     fi
 fi
 if [ -f "${legacy_config_file}" ]; then
@@ -66,6 +73,7 @@ if [ -f "${legacy_config_file}" ]; then
     fi
 fi
 # Reset firewall for new jail name
+"${LIBDIR}/bkctld-firewall" "${jail_name}"
 "${LIBDIR}/bkctld-firewall" "${new_jail_name}"
 
 test "${jail_initial_status}" = "on" && "${LIBDIR}/bkctld-start" "${new_jail_name}"