diff options
| author | erdgeist <erdgeist@erdgeist.org> | 2006-03-06 18:18:33 +0000 |
|---|---|---|
| committer | erdgeist <erdgeist@erdgeist.org> | 2006-03-06 18:18:33 +0000 |
| commit | 7e299c2c8676611dea136c4e8e0d9e6d0b3d70f8 (patch) | |
| tree | 60729cb94ea3c8ca5a3eeb88ab14ac784ed825d3 | |
| parent | e4ef7d9051d403417b2ca56f38d00347b08223e6 (diff) | |
Corrected a bug where a jail_list in rc.conf prevented ezjail to start up its own jails
| -rwxr-xr-x | ezjail.sh | 19 |
1 files changed, 10 insertions, 9 deletions
| @@ -28,18 +28,19 @@ stop_cmd="do_cmd stop '_ ezjail'" | |||
| 28 | do_cmd() | 28 | do_cmd() |
| 29 | { | 29 | { |
| 30 | action=$1; message=$2; shift 2; | 30 | action=$1; message=$2; shift 2; |
| 31 | [ -n "$*" ] && jail_list=`echo -n $* | tr -c "[:alnum:] " _` || echo -n "${message##_}" | 31 | ezjail_list= |
| 32 | jail_list=${jail_list:-`ls ${ezjail_prefix}/etc/ezjail/`} | 32 | [ -n "$*" ] && ezjail_list=`echo -n $* | tr -c "[:alnum:] " _` || echo -n "${message##_}" |
| 33 | jail_pass= | 33 | ezjail_list=${ezjail_list:-`ls ${ezjail_prefix}/etc/ezjail/`} |
| 34 | for jail in ${jail_list}; do | 34 | ezjail_pass= |
| 35 | if [ -f ${ezjail_prefix}/etc/ezjail/${jail} ]; then | 35 | for ezjail in ${ezjail_list}; do |
| 36 | . ${ezjail_prefix}/etc/ezjail/${jail} | 36 | if [ -f ${ezjail_prefix}/etc/ezjail/${ezjail} ]; then |
| 37 | jail_pass="${jail_pass} ${jail}" | 37 | . ${ezjail_prefix}/etc/ezjail/${ezjail} |
| 38 | ezjail_pass="${ezjail_pass} ${ezjail}" | ||
| 38 | else | 39 | else |
| 39 | echo " Warning: Jail ${jail} not found." | 40 | echo " Warning: Jail ${ezjail} not found." |
| 40 | fi | 41 | fi |
| 41 | done | 42 | done |
| 42 | [ "${jail_pass}" ] && sh /etc/rc.d/jail one${action} ${jail_pass} | 43 | [ "${ezjail_pass}" ] && sh /etc/rc.d/jail one${action} ${ezjail_pass} |
| 43 | } | 44 | } |
| 44 | 45 | ||
| 45 | run_rc_command $* | 46 | run_rc_command $* |
