diff options
author | erdgeist <erdgeist@erdgeist.org> | 2013-05-18 16:26:08 +0000 |
---|---|---|
committer | erdgeist <erdgeist@erdgeist.org> | 2013-05-18 16:26:08 +0000 |
commit | ca52d77c09e2fa4e8274604c7e1397e78efc7537 (patch) | |
tree | fff9bafb9756b54d2e7392445c15533031089dc5 | |
parent | e836630271343b14b3b3507b307b10e9b36ff08a (diff) |
Fix a missing if. Also drop patch level suffixes when detecting host system version
-rwxr-xr-x | ezjail-admin | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ezjail-admin b/ezjail-admin index b3c56ca..0746a06 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -992,7 +992,7 @@ setup|update) | |||
992 | 992 | ||
993 | # If ran from cron be kind to freebsds update servers and sleep first | 993 | # If ran from cron be kind to freebsds update servers and sleep first |
994 | [ -z "$TERM" -o "$TERM" = "dumb" ] && ezjail_urgency="cron" || ezjail_urgency="fetch" | 994 | [ -z "$TERM" -o "$TERM" = "dumb" ] && ezjail_urgency="cron" || ezjail_urgency="fetch" |
995 | if [ "${ezjail_use_zfs}" = "YES" ]; | 995 | if [ "${ezjail_use_zfs}" = "YES" ]; then |
996 | zfs snapshot ${ezjail_jailzfs}/basejail@`date -v -7d +"%C%y%m%d_%H:%M:%S"` | 996 | zfs snapshot ${ezjail_jailzfs}/basejail@`date -v -7d +"%C%y%m%d_%H:%M:%S"` |
997 | zfs snapshot ${ezjail_jailzfs}/newjail@`date -v -7d +"%C%y%m%d_%H:%M:%S"` | 997 | zfs snapshot ${ezjail_jailzfs}/newjail@`date -v -7d +"%C%y%m%d_%H:%M:%S"` |
998 | fi | 998 | fi |
@@ -1089,6 +1089,7 @@ install) | |||
1089 | # ftp servers normally wont provide non-RELEASE-builds | 1089 | # ftp servers normally wont provide non-RELEASE-builds |
1090 | if [ "${ezjail_proto}" != "file" ]; then | 1090 | if [ "${ezjail_proto}" != "file" ]; then |
1091 | case ${ezjail_release} in *-STABLE) ezjail_release="${ezjail_release%-STABLE}-RELEASE";; esac | 1091 | case ${ezjail_release} in *-STABLE) ezjail_release="${ezjail_release%-STABLE}-RELEASE";; esac |
1092 | case ${ezjail_release} in *-RELEASE-p*) ezjail_release=${ezjail_release%-p*};; esac | ||
1092 | if [ "${ezjail_release%-RELEASE}" = "${ezjail_release}" ]; then | 1093 | if [ "${ezjail_release%-RELEASE}" = "${ezjail_release}" ]; then |
1093 | echo "Your system is ${ezjail_release}. Normally FTP-servers don't provide non-RELEASE-builds." | 1094 | echo "Your system is ${ezjail_release}. Normally FTP-servers don't provide non-RELEASE-builds." |
1094 | [ ${ezjail_release_major} -ge 9 ] && ezjail_installarch="${ezjail_installplatform}/${ezjail_installarch}" | 1095 | [ ${ezjail_release_major} -ge 9 ] && ezjail_installarch="${ezjail_installplatform}/${ezjail_installarch}" |