diff options
-rwxr-xr-x | ezjail-admin | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ezjail-admin b/ezjail-admin index 10ca384..aee63e9 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -953,13 +953,16 @@ install) | |||
953 | # ftp servers normally wont provide non-RELEASE-builds | 953 | # ftp servers normally wont provide non-RELEASE-builds |
954 | if [ -z "${ezjail_release}" -a "${ezjail_dir}" = "${ezjail_ftphost}" ]; then | 954 | if [ -z "${ezjail_release}" -a "${ezjail_dir}" = "${ezjail_ftphost}" ]; then |
955 | ezjail_release=`uname -r` | 955 | ezjail_release=`uname -r` |
956 | ezjail_release_major=${ezjail_release%%.*} | ||
956 | case ${ezjail_release} in *-STABLE) ezjail_release="${ezjail_release%-STABLE}-RELEASE";; esac | 957 | case ${ezjail_release} in *-STABLE) ezjail_release="${ezjail_release%-STABLE}-RELEASE";; esac |
957 | if [ "${ezjail_release%-RELEASE}" = "${ezjail_release}" ]; then | 958 | if [ "${ezjail_release%-RELEASE}" = "${ezjail_release}" ]; then |
958 | echo "Your system is ${ezjail_release}. Normally FTP-servers don't provide non-RELEASE-builds." | 959 | echo "Your system is ${ezjail_release}. Normally FTP-servers don't provide non-RELEASE-builds." |
960 | [ ${ezjail_release_major} -ge 9 ] && ezjail_installarch="${ezjail_installplatform}/${ezjail_installarch}" | ||
959 | ezjail_queryftpserver || echo "... I'll continue anyway." | 961 | ezjail_queryftpserver || echo "... I'll continue anyway." |
960 | echo -n "Release [ ${ezjail_release} ]: " | 962 | echo -n "Release [ ${ezjail_release} ]: " |
961 | read ezjail_releasetmp | 963 | read ezjail_releasetmp |
962 | [ "${ezjail_releasetmp}" ] && ezjail_release=${ezjail_releasetmp} | 964 | [ "${ezjail_releasetmp}" ] && ezjail_release=${ezjail_releasetmp} |
965 | ezjail_installarch=`uname -p` | ||
963 | fi | 966 | fi |
964 | fi | 967 | fi |
965 | 968 | ||
@@ -972,8 +975,8 @@ install) | |||
972 | echo "Note: From FreeBSD 9.0 man pages are part of the base package" | 975 | echo "Note: From FreeBSD 9.0 man pages are part of the base package" |
973 | unset ezjail_installmanpages | 976 | unset ezjail_installmanpages |
974 | fi | 977 | fi |
975 | [ ${ezjail_release_major} -ge 9 ] && ezjail_installarch="${ezjail_installplatform}/${ezjail_installarch}" | 978 | [ ${ezjail_release_major} -ge 9 ] && ezjail_installarch="${ezjail_installplatform}/${ezjail_installarch}" |
976 | [ ${ezjail_release_major} -ge 9 ] && ezjail_pkgsuffix=".txz" || ezjail_pkgsuffix="/*" | 979 | [ ${ezjail_release_major} -ge 9 ] && ezjail_pkgsuffix=".txz" || ezjail_pkgsuffix="/*" |
977 | 980 | ||
978 | # Normally fulljail should be renamed by past ezjail-admin commands. | 981 | # Normally fulljail should be renamed by past ezjail-admin commands. |
979 | # However those may have failed | 982 | # However those may have failed |