diff options
-rwxr-xr-x | ezjail-admin | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/ezjail-admin b/ezjail-admin index 8727c41..878d149 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -980,19 +980,22 @@ install) | |||
980 | # Check for basejail when not installing base jail | 980 | # Check for basejail when not installing base jail |
981 | [ "${ezjail_basesystem}" -o -d "${ezjail_jailbase}" ] || exerr "Error: The basejail does not exist.\n You cannot install distribution packages before creating ezjails environment.\n Please run '${ezjail_admin} update' or '${ezjail_admin} install' using lower case parameters first." | 981 | [ "${ezjail_basesystem}" -o -d "${ezjail_jailbase}" ] || exerr "Error: The basejail does not exist.\n You cannot install distribution packages before creating ezjails environment.\n Please run '${ezjail_admin} update' or '${ezjail_admin} install' using lower case parameters first." |
982 | 982 | ||
983 | # ftp servers normally wont provide non-RELEASE-builds | 983 | if [ -z "${ezjail_release}" ]; then |
984 | if [ -z "${ezjail_release}" -a "${ezjail_dir}" = "${ezjail_ftphost}" ]; then | 984 | # if no release version is requested, use the host system's |
985 | ezjail_release=`uname -r` | 985 | ezjail_release=`uname -r` |
986 | ezjail_release_major=${ezjail_release%%.*} | 986 | ezjail_release_major=${ezjail_release%%.*} |
987 | case ${ezjail_release} in *-STABLE) ezjail_release="${ezjail_release%-STABLE}-RELEASE";; esac | 987 | |
988 | if [ "${ezjail_release%-RELEASE}" = "${ezjail_release}" ]; then | 988 | # ftp servers normally wont provide non-RELEASE-builds |
989 | echo "Your system is ${ezjail_release}. Normally FTP-servers don't provide non-RELEASE-builds." | 989 | if [ "${ezjail_dir}" = "${ezjail_ftphost}" ]; then |
990 | [ ${ezjail_release_major} -ge 9 ] && ezjail_installarch="${ezjail_installplatform}/${ezjail_installarch}" | 990 | case ${ezjail_release} in *-STABLE) ezjail_release="${ezjail_release%-STABLE}-RELEASE";; esac |
991 | ezjail_queryftpserver || echo "... I'll continue anyway." | 991 | if [ "${ezjail_release%-RELEASE}" = "${ezjail_release}" ]; then |
992 | echo -n "Release [ ${ezjail_release} ]: " | 992 | echo "Your system is ${ezjail_release}. Normally FTP-servers don't provide non-RELEASE-builds." |
993 | read ezjail_releasetmp | 993 | [ ${ezjail_release_major} -ge 9 ] && ezjail_installarch="${ezjail_installplatform}/${ezjail_installarch}" |
994 | [ "${ezjail_releasetmp}" ] && ezjail_release=${ezjail_releasetmp} | 994 | ezjail_queryftpserver || echo "... I'll continue anyway." |
995 | ezjail_installarch=`uname -p` | 995 | echo -n "Release [ ${ezjail_release} ]: " |
996 | read ezjail_releasetmp | ||
997 | [ "${ezjail_releasetmp}" ] && ezjail_release=${ezjail_releasetmp} | ||
998 | ezjail_installarch=`uname -p` | ||
996 | fi | 999 | fi |
997 | fi | 1000 | fi |
998 | 1001 | ||