Two bugs preventing jails to be set norun or run have been fixed.

This commit is contained in:
erdgeist 2006-04-15 20:48:26 +00:00
parent ec8cc657b2
commit 506341bf17

View File

@ -417,22 +417,22 @@ setup|update)
;; ;;
######################## ezjail-admin CONFIG ######################## ######################## ezjail-admin CONFIG ########################
config) config)
shift shift
args=`getopt -r: $*` || exerr "Usage: `basename -- $0` config [-r run|norun] jailname" args=`getopt -r: $*` || exerr "Usage: `basename -- $0` config [-r run|norun] jailname"
ezjail_setrunnable= ezjail_setrunnable=
set -- ${args} set -- ${args}
for arg do for arg do
case ${arg} in case ${arg} in
-r) ezjail_setrunnable=$1; shift 2;; -r) ezjail_setrunnable=$2; shift 2;;
--) shift; break;; --) shift; break;;
esac esac
done done
[ $# = 1 ] || exerr "Usage: `basename -- $0` config [-r run|norun] jailname" [ $# = 1 ] || exerr "Usage: `basename -- $0` config [-r run|norun] jailname"
# Jail name mandatory # Jail name mandatory
fetchjailinfo $1 fetchjailinfo $1
@ -444,10 +444,10 @@ config)
case ${ezjail_setrunnable} in case ${ezjail_setrunnable} in
run) run)
[ "${ezjail_config}" = "${ezjail_config%.norun}" ] || mv {ezjail_config} ${ezjail_config%.norun} [ "${ezjail_config}" = "${ezjail_config%.norun}" ] || mv ${ezjail_config} ${ezjail_config%.norun}
;; ;;
norun) norun)
[ "${ezjail_config}" = "${ezjail_config%.norun}" ] && mv {ezjail_config} ${ezjail_config}.norun [ "${ezjail_config}" = "${ezjail_config%.norun}" ] && mv ${ezjail_config} ${ezjail_config}.norun
;; ;;
esac esac