Include version information. Also fix an amd64 install problem.
This commit is contained in:
parent
1667d0f8de
commit
0db3c2df89
13
ezjail-admin
13
ezjail-admin
@ -31,10 +31,13 @@ ezjail_procfs_enable=${ezjail_procfs_enable:-"YES"}
|
|||||||
ezjail_fdescfs_enable=${ezjail_fdescfs_enable:-"YES"}
|
ezjail_fdescfs_enable=${ezjail_fdescfs_enable:-"YES"}
|
||||||
|
|
||||||
ezjail_dirlist="bin boot lib libexec rescue sbin usr/bin usr/games usr/include usr/lib usr/libdata usr/libexec usr/sbin usr/src usr/share"
|
ezjail_dirlist="bin boot lib libexec rescue sbin usr/bin usr/games usr/include usr/lib usr/libdata usr/libexec usr/sbin usr/src usr/share"
|
||||||
case `uname -p` in amd64) ezjail_dirlist="${ezjail_dirlist} usr/lib32";; esac
|
ezjail_basesystem="base"
|
||||||
|
|
||||||
|
# amd64 is a really strange platform
|
||||||
|
case `uname -p` in amd64) ezjail_dirlist="${ezjail_dirlist} usr/lib32"; ezjail_basesystem="${ezjail_basesystem} lib32";; esac
|
||||||
|
|
||||||
# Synopsis messages
|
# Synopsis messages
|
||||||
ezjail_usage_ezjailadmin="Usage: ${ezjail_admin} [archive|config|console|create|delete|install|list|restore|update] {params}"
|
ezjail_usage_ezjailadmin="ezjail-admin v3.0b\nUsage: ${ezjail_admin} [archive|config|console|create|delete|install|list|restore|update] {params}"
|
||||||
ezjail_usage_install="Usage: ${ezjail_admin} install [-mps] [-h host] [-r release]"
|
ezjail_usage_install="Usage: ${ezjail_admin} install [-mps] [-h host] [-r release]"
|
||||||
ezjail_usage_create="Usage: ${ezjail_admin} create [-xbi] [-f flavour] [-r jailroot] [-s size] [-c bde|eli] [-C args] [-a archive] jailname jailip"
|
ezjail_usage_create="Usage: ${ezjail_admin} create [-xbi] [-f flavour] [-r jailroot] [-s size] [-c bde|eli] [-C args] [-a archive] jailname jailip"
|
||||||
ezjail_usage_delete="Usage: ${ezjail_admin} delete [-w] jailname"
|
ezjail_usage_delete="Usage: ${ezjail_admin} delete [-w] jailname"
|
||||||
@ -50,7 +53,7 @@ ezjail_usage_list="Usage: ${ezjail_admin} list"
|
|||||||
#
|
#
|
||||||
|
|
||||||
# define our bail out shortcut
|
# define our bail out shortcut
|
||||||
exerr () { echo -e $* >&2 ; exit 1; }
|
exerr () { echo -e "$*" >&2 ; exit 1; }
|
||||||
|
|
||||||
# generic attach routine for image jails
|
# generic attach routine for image jails
|
||||||
attach_images () {
|
attach_images () {
|
||||||
@ -703,7 +706,7 @@ install)
|
|||||||
DESTDIR=${ezjail_jailfull}
|
DESTDIR=${ezjail_jailfull}
|
||||||
|
|
||||||
rm -rf "${ezjail_jailtemp}"
|
rm -rf "${ezjail_jailtemp}"
|
||||||
for pkg in base ${ezjail_installmanpages} ${ezjail_installsources}; do
|
for pkg in ${ezjail_basesystem} ${ezjail_installmanpages} ${ezjail_installsources}; do
|
||||||
|
|
||||||
# The first case means, that a remote host has been specified.
|
# The first case means, that a remote host has been specified.
|
||||||
if [ "${ezjail_dir}" = "${ezjail_ftphost}" ]; then
|
if [ "${ezjail_dir}" = "${ezjail_ftphost}" ]; then
|
||||||
@ -1097,6 +1100,6 @@ config)
|
|||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
exerr ${ezjail_usage_ezjailadmin}
|
exerr "${ezjail_usage_ezjailadmin}"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
Loading…
x
Reference in New Issue
Block a user