summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2006-05-17 13:07:32 +0000
committererdgeist <erdgeist@erdgeist.org>2006-05-17 13:07:32 +0000
commit841d0d4c1260c66f0ec1f52e09e29c827570a3de (patch)
treeed72b2559854038759bf713f02ffc0c502f2f4e4
parent0daab71ac09d2f87ec45d126658d5dd5bdc1bdb5 (diff)
Explain options left if fetching packages fails. Also explain, that "are you sure" is being answered by ezjail.
-rwxr-xr-xezjail-admin3
1 files changed, 2 insertions, 1 deletions
diff --git a/ezjail-admin b/ezjail-admin
index 8158049..8141989 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -533,13 +533,14 @@ install)
533 533
534 # Try all paths as stolen from sysinstall, break on success. 534 # Try all paths as stolen from sysinstall, break on success.
535 for ezjail_path in pub/FreeBSD/releases pub/FreeBSD/snapshot pub/FreeBSD releases snapshots NO; do 535 for ezjail_path in pub/FreeBSD/releases pub/FreeBSD/snapshot pub/FreeBSD releases snapshots NO; do
536 [ "${ezjail_path}" = "NO" ] && exerr "Could not fetch ${pkg} from ${ezjail_ftphost}." 536 [ "${ezjail_path}" = "NO" ] && exerr "Could not fetch ${pkg} from ${ezjail_ftphost}. Maybe your release (${ezjail_release}) is specified incorrectly or the host ${ezjail_ftphost} does not provide that release build. Use the -r option to specify an existing release or the -h option to specify an alternative ftp server."
537 ftp "${ezjail_ftphost}:${ezjail_path}/${ezjail_installarch}/${ezjail_release}/${pkg}/*" && break 537 ftp "${ezjail_ftphost}:${ezjail_path}/${ezjail_installarch}/${ezjail_release}/${pkg}/*" && break
538 done 538 done
539 539
540 # These actions are really ugly: sources want $1 to contain the set 540 # These actions are really ugly: sources want $1 to contain the set
541 # of sources to install, base asks the user if he is sure, hence the 541 # of sources to install, base asks the user if he is sure, hence the
542 # yes and the set -- all 542 # yes and the set -- all
543 [ "${pkg}" = "base" ] && echo "Ignore the next question, ezjail answers it for you."
543 set -- all 544 set -- all
544 [ -f install.sh ] && yes | . install.sh 545 [ -f install.sh ] && yes | . install.sh
545 [ $? = 0 ] || exerr "Package install script for ${pkg} failed." 546 [ $? = 0 ] || exerr "Package install script for ${pkg} failed."