summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2008-03-22 11:35:07 +0000
committererdgeist <erdgeist@erdgeist.org>2008-03-22 11:35:07 +0000
commit0db3c2df899390515adcdd28b6371c06bf23a3a5 (patch)
treefff36a517f8b0761dfba915979f515fae1fba16a
parent1667d0f8de5900fa6ad8b9fa1c13b16e748a458e (diff)
Include version information. Also fix an amd64 install problem.
-rwxr-xr-xezjail-admin13
1 files changed, 8 insertions, 5 deletions
diff --git a/ezjail-admin b/ezjail-admin
index 2da9565..ec9edf5 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -31,10 +31,13 @@ ezjail_procfs_enable=${ezjail_procfs_enable:-"YES"}
31ezjail_fdescfs_enable=${ezjail_fdescfs_enable:-"YES"} 31ezjail_fdescfs_enable=${ezjail_fdescfs_enable:-"YES"}
32 32
33ezjail_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" 33ezjail_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"
34case `uname -p` in amd64) ezjail_dirlist="${ezjail_dirlist} usr/lib32";; esac 34ezjail_basesystem="base"
35
36# amd64 is a really strange platform
37case `uname -p` in amd64) ezjail_dirlist="${ezjail_dirlist} usr/lib32"; ezjail_basesystem="${ezjail_basesystem} lib32";; esac
35 38
36# Synopsis messages 39# Synopsis messages
37ezjail_usage_ezjailadmin="Usage: ${ezjail_admin} [archive|config|console|create|delete|install|list|restore|update] {params}" 40ezjail_usage_ezjailadmin="ezjail-admin v3.0b\nUsage: ${ezjail_admin} [archive|config|console|create|delete|install|list|restore|update] {params}"
38ezjail_usage_install="Usage: ${ezjail_admin} install [-mps] [-h host] [-r release]" 41ezjail_usage_install="Usage: ${ezjail_admin} install [-mps] [-h host] [-r release]"
39ezjail_usage_create="Usage: ${ezjail_admin} create [-xbi] [-f flavour] [-r jailroot] [-s size] [-c bde|eli] [-C args] [-a archive] jailname jailip" 42ezjail_usage_create="Usage: ${ezjail_admin} create [-xbi] [-f flavour] [-r jailroot] [-s size] [-c bde|eli] [-C args] [-a archive] jailname jailip"
40ezjail_usage_delete="Usage: ${ezjail_admin} delete [-w] jailname" 43ezjail_usage_delete="Usage: ${ezjail_admin} delete [-w] jailname"
@@ -50,7 +53,7 @@ ezjail_usage_list="Usage: ${ezjail_admin} list"
50# 53#
51 54
52# define our bail out shortcut 55# define our bail out shortcut
53exerr () { echo -e $* >&2 ; exit 1; } 56exerr () { echo -e "$*" >&2 ; exit 1; }
54 57
55# generic attach routine for image jails 58# generic attach routine for image jails
56attach_images () { 59attach_images () {
@@ -703,7 +706,7 @@ install)
703 DESTDIR=${ezjail_jailfull} 706 DESTDIR=${ezjail_jailfull}
704 707
705 rm -rf "${ezjail_jailtemp}" 708 rm -rf "${ezjail_jailtemp}"
706 for pkg in base ${ezjail_installmanpages} ${ezjail_installsources}; do 709 for pkg in ${ezjail_basesystem} ${ezjail_installmanpages} ${ezjail_installsources}; do
707 710
708 # The first case means, that a remote host has been specified. 711 # The first case means, that a remote host has been specified.
709 if [ "${ezjail_dir}" = "${ezjail_ftphost}" ]; then 712 if [ "${ezjail_dir}" = "${ezjail_ftphost}" ]; then
@@ -1097,6 +1100,6 @@ config)
1097 esac 1100 esac
1098 ;; 1101 ;;
1099*) 1102*)
1100 exerr ${ezjail_usage_ezjailadmin} 1103 exerr "${ezjail_usage_ezjailadmin}"
1101 ;; 1104 ;;
1102esac 1105esac