summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcryx <cryx@h3q.com>2010-01-15 13:59:38 +0000
committercryx <cryx@h3q.com>2010-01-15 13:59:38 +0000
commitb0f2792970a44f82c4e1fcebd9adc566fae578bd (patch)
treeaf3acc5ef388a6f536bb80e0cb2eb27711477051
parentcc6ceaad9bb3ef70f231ad09ab857a0e79eb302f (diff)
When renaming a zfs backed jail, don't try to move the rootdir because it is done by zfs rename.
-rwxr-xr-xezjail-admin2
1 files changed, 1 insertions, 1 deletions
diff --git a/ezjail-admin b/ezjail-admin
index 557ae9e..5840be8 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -1242,7 +1242,7 @@ config)
1242 # we might end up at an existing directory 1242 # we might end up at an existing directory
1243 [ -e "${ezjail_rootdir}" ] && exerr "Error: An object already exists at ${ezjail_rootdir}, cant rename." 1243 [ -e "${ezjail_rootdir}" ] && exerr "Error: An object already exists at ${ezjail_rootdir}, cant rename."
1244 1244
1245 mv "${ezjail_old_rootdir}" "${ezjail_rootdir}" 1245 [ "${ezjail_imagetype}" = "zfs" ] || mv "${ezjail_old_rootdir}" "${ezjail_rootdir}"
1246 fi 1246 fi
1247 1247
1248 # This scenario really will only lead to real troubles in the 'fulljail' 1248 # This scenario really will only lead to real troubles in the 'fulljail'