1 files changed, 8 insertions, 0 deletions

diff --git a/ezjail-admin b/ezjail-admin
index ee67d83..0eec9e7 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -652,11 +652,19 @@ config)
     # so check, whether we might be running into problems
     [ -e ${ezjail_new_config} -o -e ${ezjail_new_config}.norun ] && exerr "Error: an ezjail config already exists at ${ezjail_new_config}. Please rename the ezjail."
 
+    # since we just used the old rootdir prefix and added the new hostname,
+    # we might end up at an existing directory
+    [ -e ${ezjail_new_rootdir} ] && exerr "Error: An object already exists at ${ezjail_new_rootdir}, cant rename."
+
+    # prevent trouble with creating our softlink
+    [ -L ${ezjail_softlink} -a -e ${ezjail_new_softlink} ] && exerr "Error: An object already exists at ${ezjail_new_softlink}, cant create softlink there."
+
     # need to rename the image?
     if [ -n "${ezjail_image}" ]; then
       # Do we have an auto generated image name?
       if [ "${ezjail_rootdir}.img" = "${ezjail_image}" ]; then
         ezjail_new_image=${ezjail_new_rootdir}.img
+        [ -e ${ezjail_new_image} ] && exerr "Error: An object already exists at ${ezjail_new_image}, cant rename image."
         mv ${ezjail_image} ${ezjail_new_image}
       else
         ezjail_new_image=${ezjail_image}