diff options
author | erdgeist <erdgeist@erdgeist.org> | 2010-01-08 22:33:08 +0000 |
---|---|---|
committer | erdgeist <erdgeist@erdgeist.org> | 2010-01-08 22:33:08 +0000 |
commit | 069c22e6aeb950093c7cf2fc704d69ad7be22550 (patch) | |
tree | b2b2b82bc857b93e119797cf868676d4e1198912 | |
parent | 7bc936b857e58c994a9f99f310a6e0f401d7ebf4 (diff) |
Rearrange space in ezjail-admin list... more needs to be done vor v6 addresses.
-rwxr-xr-x | ezjail-admin | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ezjail-admin b/ezjail-admin index 4758e21..6ba5f27 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -730,8 +730,8 @@ list) | |||
730 | 730 | ||
731 | [ -d "${ezjail_prefix}/etc/ezjail/" ] && cd "${ezjail_prefix}/etc/ezjail/" && ezjail_list=`ls | xargs rcorder` | 731 | [ -d "${ezjail_prefix}/etc/ezjail/" ] && cd "${ezjail_prefix}/etc/ezjail/" && ezjail_list=`ls | xargs rcorder` |
732 | 732 | ||
733 | printf "%-3s %-5s %-15s %-28s %s\\n" STA JID IP Hostname "Root Directory" | 733 | printf "%-3s %-4s %-15s %-30s %s\\n" STA JID IP Hostname "Root Directory" |
734 | echo "--- ----- --------------- ---------------------------- -------------------------" | 734 | echo "--- ---- --------------- ---------------------------- -------------------------" |
735 | for ezjail in ${ezjail_list}; do | 735 | for ezjail in ${ezjail_list}; do |
736 | fetchjailinfo ${ezjail%.norun} | 736 | fetchjailinfo ${ezjail%.norun} |
737 | case ${ezjail_imagetype} in simple) ezjail_state="I";; bde) ezjail_state="B";; eli) ezjail_state="E";; *) ezjail_state="D";; esac | 737 | case ${ezjail_imagetype} in simple) ezjail_state="I";; bde) ezjail_state="B";; eli) ezjail_state="E";; *) ezjail_state="D";; esac |
@@ -745,7 +745,7 @@ list) | |||
745 | TIFS=${IFS}; IFS=,; unset _multiline | 745 | TIFS=${IFS}; IFS=,; unset _multiline |
746 | for ezjail_ip in ${ezjail_ips}; do | 746 | for ezjail_ip in ${ezjail_ips}; do |
747 | if [ -z "${_multiline}" ]; then | 747 | if [ -z "${_multiline}" ]; then |
748 | printf "%-3s %-5s %-15s %-28s %s\\n" "${ezjail_state}" "${ezjail_id:-N/A}" "${ezjail_ip}" "${ezjail_hostname}" "${ezjail_rootdir}" | 748 | printf "%-3s %-4s %-15s %-30s %s\\n" "${ezjail_state}" "${ezjail_id:-N/A}" "${ezjail_ip}" "${ezjail_hostname}" "${ezjail_rootdir}" |
749 | _multiline=yes | 749 | _multiline=yes |
750 | else | 750 | else |
751 | echo " ${ezjail_ip}" | 751 | echo " ${ezjail_ip}" |
@@ -1392,7 +1392,6 @@ config) | |||
1392 | 1392 | ||
1393 | fi | 1393 | fi |
1394 | 1394 | ||
1395 | |||
1396 | case "${ezjail_setrunnable}" in | 1395 | case "${ezjail_setrunnable}" in |
1397 | run) [ "${ezjail_config}" = "${ezjail_config%.norun}" ] || mv "${ezjail_config}" "${ezjail_config%.norun}";; | 1396 | run) [ "${ezjail_config}" = "${ezjail_config%.norun}" ] || mv "${ezjail_config}" "${ezjail_config%.norun}";; |
1398 | norun) [ "${ezjail_config}" = "${ezjail_config%.norun}" ] && mv "${ezjail_config}" "${ezjail_config}.norun" ;; | 1397 | norun) [ "${ezjail_config}" = "${ezjail_config%.norun}" ] && mv "${ezjail_config}" "${ezjail_config}.norun" ;; |