From 38bd97262a80fc5fb73b076115610eee501a6ea0 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Thu, 20 Jan 2011 14:23:59 +0000
Subject: Fix bug: ezjail-admin install -M and ezjail-admin install -S only
 installed to staging directory, not into basejail.

---
 ezjail-admin | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'ezjail-admin')

diff --git a/ezjail-admin b/ezjail-admin
index 09d748f..6f5f849 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -937,7 +937,10 @@ install)
     [ -d "${ezjail_jailfull}" ] && chflags -R noschg "${ezjail_jailfull}" && rm -rf "${ezjail_jailfull}"
     mkdir -p "${ezjail_jailfull}" || exerr "Error: Cannot create temporary Jail directory."
   fi
-  DESTDIR=${ezjail_jailfull}
+
+  # Install into staging directory for full install or into basejail
+  # for post-install man/src installations
+  [ "${ezjail_basesystem}" ] && DESTDIR="${ezjail_jailfull}" || DESTDIR="${ezjail_jailbase}"
 
   rm -rf "${ezjail_jailtemp}"
   for pkg in ${ezjail_basesystem} ${ezjail_installmanpages} ${ezjail_installsources}; do
-- 
cgit v1.2.3