summaryrefslogtreecommitdiff
path: root/ezjail-admin
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2007-02-21 04:22:08 +0000
committererdgeist <erdgeist@erdgeist.org>2007-02-21 04:22:08 +0000
commit79efdfa0360100b437fa42f9e055a9074a69eff5 (patch)
treeb78667126d84ed4e1c0eed9d105c3c5a62ff8a60 /ezjail-admin
parentb5f4cc892ac0b38d2ea633a67fa7bb6795aaa4fc (diff)
ezjail-admin create now ignores dot files when checking, whether a directory is empty. That way .snap wont mark it non-empty. However, Lost+Found still is a problem.
Diffstat (limited to 'ezjail-admin')
-rwxr-xr-xezjail-admin2
1 files changed, 1 insertions, 1 deletions
diff --git a/ezjail-admin b/ezjail-admin
index de91655..e343e6e 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -278,7 +278,7 @@ create)
278 # if a directory at the specified jail root already exists, refuse to 278 # if a directory at the specified jail root already exists, refuse to
279 # install. Empty root dirs are considered okay, sometimes they are 279 # install. Empty root dirs are considered okay, sometimes they are
280 # mount points to be filled by ezjail. 280 # mount points to be filled by ezjail.
281 [ -d ${ezjail_rootdir} ] && [ "`ls -A ${ezjail_rootdir} | wc -l`" -eq 0 ] && ezjail_rootdirempty="YES" 281 [ -d ${ezjail_rootdir} -a -z "`ls -I ${ezjail_rootdir}`" ] && ezjail_rootdirempty="YES"
282 [ -e ${ezjail_rootdir} -a -z "${ezjail_rootdirempty}" -a -z "${ezjail_exists}" ] && exerr "Error: the specified jail root ${ezjail_rootdir} already exists." 282 [ -e ${ezjail_rootdir} -a -z "${ezjail_rootdirempty}" -a -z "${ezjail_exists}" ] && exerr "Error: the specified jail root ${ezjail_rootdir} already exists."
283 283
284 # if jail root specified on command line does not lie within our jail 284 # if jail root specified on command line does not lie within our jail