From 70fbab9bb04d2e2319cb085d9b9bd0e77418f877 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Sat, 28 Jan 2023 16:07:39 +0100
Subject: [PATCH] Test presence of old config file before trying to delete it

---
 server/CHANGELOG.md      | 2 ++
 server/lib/bkctld-remove | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/CHANGELOG.md b/server/CHANGELOG.md
index 3012189..a3bfad3 100644
--- a/server/CHANGELOG.md
+++ b/server/CHANGELOG.md
@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+* Test presence of old config file before trying to delete it
+
 ### Security
 
 ## [22.11] - 2022-11-28
diff --git a/server/lib/bkctld-remove b/server/lib/bkctld-remove
index 382bac7..87a0ec0 100755
--- a/server/lib/bkctld-remove
+++ b/server/lib/bkctld-remove
@@ -49,7 +49,7 @@ fi
 
 "${LIBDIR}/bkctld-is-on" "${jail_name}" && "${LIBDIR}/bkctld-stop" "${jail_name}"
 
-rm -f "${CONFDIR}/${jail_name}"
+test -f "${CONFDIR}/${jail_name}" && rm -f "${CONFDIR}/${jail_name}"
 rm -rf "$(jail_config_dir "${jail_name}")"
 
 btrfs_bin=$(command -v btrfs)