diff options
author | fred <frederic.perrin@resel.fr> | 2011-04-05 09:17:54 +0000 |
---|---|---|
committer | fred <frederic.perrin@resel.fr> | 2011-04-05 09:17:54 +0000 |
commit | 76c2b21f0000d5f12c43723f9b816837c4cb801e (patch) | |
tree | 051dd6c5a82e604d5b0e86b4f7c32f8d685f3713 /ezjail-admin | |
parent | 2940b6dc70bca476806bd1c59e55ab418b1d49af (diff) |
Add -U in the getopts line. Only one = in a [ test.
Diffstat (limited to 'ezjail-admin')
-rwxr-xr-x | ezjail-admin | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ezjail-admin b/ezjail-admin index 5f7fcdc..887fabf 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -839,7 +839,7 @@ setup|update) | |||
839 | # Clean variables, prevent polution | 839 | # Clean variables, prevent polution |
840 | unset ezjail_provideports ezjail_installaction ezjail_osversion_source ezjail_osversion_destination | 840 | unset ezjail_provideports ezjail_installaction ezjail_osversion_source ezjail_osversion_destination |
841 | 841 | ||
842 | shift; while getopts :biupPs: arg; do case ${arg} in | 842 | shift; while getopts :biuUpPs: arg; do case ${arg} in |
843 | b) ezjail_installaction="buildworld installworld";; | 843 | b) ezjail_installaction="buildworld installworld";; |
844 | i) ezjail_installaction="installworld";; | 844 | i) ezjail_installaction="installworld";; |
845 | u) ezjail_installaction="freebsd-update";; | 845 | u) ezjail_installaction="freebsd-update";; |
@@ -871,7 +871,7 @@ setup|update) | |||
871 | [ -z "$TERM" -o "$TERM" = "dumb" ] && ezjail_urgency="cron" || ezjail_urgency="fetch" | 871 | [ -z "$TERM" -o "$TERM" = "dumb" ] && ezjail_urgency="cron" || ezjail_urgency="fetch" |
872 | [ "${ezjail_use_zfs}" = "YES" ] && zfs snapshot ${ezjail_jailzfs}/basejail@`date -v -7d +"%C%y%m%d_%H:%M:%S"` | 872 | [ "${ezjail_use_zfs}" = "YES" ] && zfs snapshot ${ezjail_jailzfs}/basejail@`date -v -7d +"%C%y%m%d_%H:%M:%S"` |
873 | freebsd-update -b ${ezjail_jailbase} ${ezjail_urgency} install | 873 | freebsd-update -b ${ezjail_jailbase} ${ezjail_urgency} install |
874 | elif [ "${ezjail_installaction}" == "freebsd-upgrade" ]; then | 874 | elif [ "${ezjail_installaction}" = "freebsd-upgrade" ]; then |
875 | [ -d "${ezjail_jailbase}" ] || exerr "Error: base jail does not exist.\n You cannot update a base jail until it is created.\n Please run '${ezjail_admin} update' or '${ezjail_admin} install' first." | 875 | [ -d "${ezjail_jailbase}" ] || exerr "Error: base jail does not exist.\n You cannot update a base jail until it is created.\n Please run '${ezjail_admin} update' or '${ezjail_admin} install' first." |
876 | 876 | ||
877 | [ -z "${ezjail_sourcetree}" ] && exerr "Error: Can not (yet automatically) infer the basejail's osversion.\n Please run ${ezjail_admin} update -U -s X.X-RELEASE, with X.X-RELEASE being to osversion currently installed in the basejail in need of an upgrade." | 877 | [ -z "${ezjail_sourcetree}" ] && exerr "Error: Can not (yet automatically) infer the basejail's osversion.\n Please run ${ezjail_admin} update -U -s X.X-RELEASE, with X.X-RELEASE being to osversion currently installed in the basejail in need of an upgrade." |