diff options
author | erdgeist <erdgeist@erdgeist.org> | 2012-01-02 04:54:05 +0000 |
---|---|---|
committer | erdgeist <erdgeist@erdgeist.org> | 2012-01-02 04:54:05 +0000 |
commit | 864e6d12b636274e2e0e0f2c64924554c5184312 (patch) | |
tree | 5ab538e660b5b07d8fc60797e15eb397603d0b2d | |
parent | fe8e579fef83d3e3f413fb054c9b550b20f92d21 (diff) |
Some more subtle changes in the new release directory structure
-rwxr-xr-x | ezjail-admin | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ezjail-admin b/ezjail-admin index 2ca46aa..54d2654 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -966,7 +966,8 @@ install) | |||
966 | # From 9.0 releases come with a new layout | 966 | # From 9.0 releases come with a new layout |
967 | # It is now a single archive ${pkg}.txz instead of a list of archive parts under ${pkg}/* | 967 | # It is now a single archive ${pkg}.txz instead of a list of archive parts under ${pkg}/* |
968 | # We assume for now that jail's platform is supposed to be that of the host. That may change later. | 968 | # We assume for now that jail's platform is supposed to be that of the host. That may change later. |
969 | ezjail_release_major=${ezjail_release%%.} | 969 | ezjail_release_major=${ezjail_release%%.*} |
970 | [ ${ezjail_release_major} -ge 9 -a -n "${ezjail_installmanpages}" ] && ezjail_installmanpages=doc | ||
970 | 971 | ||
971 | # Normally fulljail should be renamed by past ezjail-admin commands. | 972 | # Normally fulljail should be renamed by past ezjail-admin commands. |
972 | # However those may have failed | 973 | # However those may have failed |
@@ -1001,7 +1002,7 @@ install) | |||
1001 | [ "${ezjail_ftpserverqueried}" ] || ezjail_queryftpserver | 1002 | [ "${ezjail_ftpserverqueried}" ] || ezjail_queryftpserver |
1002 | exit 1 | 1003 | exit 1 |
1003 | fi | 1004 | fi |
1004 | if [${ezjail_release_major} -ge 9 ]; then | 1005 | if [ ${ezjail_release_major} -ge 9 ]; then |
1005 | ftp "${ezjail_ftphost}:${ezjail_path}/${ezjail_installplatform}/${ezjail_installarch}/${ezjail_release}/${pkg}.txz" && break | 1006 | ftp "${ezjail_ftphost}:${ezjail_path}/${ezjail_installplatform}/${ezjail_installarch}/${ezjail_release}/${pkg}.txz" && break |
1006 | else | 1007 | else |
1007 | ftp "${ezjail_ftphost}:${ezjail_path}/${ezjail_installarch}/${ezjail_release}/${pkg}/*" && break | 1008 | ftp "${ezjail_ftphost}:${ezjail_path}/${ezjail_installarch}/${ezjail_release}/${pkg}/*" && break |