Fix bug: ezjail-admin install -M and ezjail-admin install -S only installed to staging directory, not into basejail.
This commit is contained in:
parent
1e718d4c5f
commit
38bd97262a
@ -937,7 +937,10 @@ install)
|
|||||||
[ -d "${ezjail_jailfull}" ] && chflags -R noschg "${ezjail_jailfull}" && rm -rf "${ezjail_jailfull}"
|
[ -d "${ezjail_jailfull}" ] && chflags -R noschg "${ezjail_jailfull}" && rm -rf "${ezjail_jailfull}"
|
||||||
mkdir -p "${ezjail_jailfull}" || exerr "Error: Cannot create temporary Jail directory."
|
mkdir -p "${ezjail_jailfull}" || exerr "Error: Cannot create temporary Jail directory."
|
||||||
fi
|
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}"
|
rm -rf "${ezjail_jailtemp}"
|
||||||
for pkg in ${ezjail_basesystem} ${ezjail_installmanpages} ${ezjail_installsources}; do
|
for pkg in ${ezjail_basesystem} ${ezjail_installmanpages} ${ezjail_installsources}; do
|
||||||
|
Loading…
x
Reference in New Issue
Block a user