summaryrefslogtreecommitdiff
path: root/ezjail-admin
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2011-01-20 14:23:59 +0000
committererdgeist <erdgeist@erdgeist.org>2011-01-20 14:23:59 +0000
commit38bd97262a80fc5fb73b076115610eee501a6ea0 (patch)
treef76372e107096235bdfa4eb9aadc3827cbaab938 /ezjail-admin
parent1e718d4c5fca7afbf7b96848f54f94d08e654a51 (diff)
Fix bug: ezjail-admin install -M and ezjail-admin install -S only installed to staging directory, not into basejail.
Diffstat (limited to 'ezjail-admin')
-rwxr-xr-xezjail-admin5
1 files changed, 4 insertions, 1 deletions
diff --git a/ezjail-admin b/ezjail-admin
index 09d748f..6f5f849 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -937,7 +937,10 @@ install)
937 [ -d "${ezjail_jailfull}" ] && chflags -R noschg "${ezjail_jailfull}" && rm -rf "${ezjail_jailfull}" 937 [ -d "${ezjail_jailfull}" ] && chflags -R noschg "${ezjail_jailfull}" && rm -rf "${ezjail_jailfull}"
938 mkdir -p "${ezjail_jailfull}" || exerr "Error: Cannot create temporary Jail directory." 938 mkdir -p "${ezjail_jailfull}" || exerr "Error: Cannot create temporary Jail directory."
939 fi 939 fi
940 DESTDIR=${ezjail_jailfull} 940
941 # Install into staging directory for full install or into basejail
942 # for post-install man/src installations
943 [ "${ezjail_basesystem}" ] && DESTDIR="${ezjail_jailfull}" || DESTDIR="${ezjail_jailbase}"
941 944
942 rm -rf "${ezjail_jailtemp}" 945 rm -rf "${ezjail_jailtemp}"
943 for pkg in ${ezjail_basesystem} ${ezjail_installmanpages} ${ezjail_installsources}; do 946 for pkg in ${ezjail_basesystem} ${ezjail_installmanpages} ${ezjail_installsources}; do