ruben/ezjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rearrange space in ezjail-admin list... more needs to be done vor v6 addresses.

Browse Source
This commit is contained in:
erdgeist 2010-01-08 22:33:08 +00:00
parent 7bc936b857
commit 069c22e6ae
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ezjail-admin
View File

@ -730,8 +730,8 @@ list)
[ -d "${ezjail_prefix}/etc/ezjail/" ] && cd "${ezjail_prefix}/etc/ezjail/" && ezjail_list=`ls | xargs rcorder` [ -d "${ezjail_prefix}/etc/ezjail/" ] && cd "${ezjail_prefix}/etc/ezjail/" && ezjail_list=`ls | xargs rcorder`
printf "%-3s %-5s %-15s %-28s %s\\n" STA JID IP Hostname "Root Directory" printf "%-3s %-4s %-15s %-30s %s\\n" STA JID IP Hostname "Root Directory"
echo "--- ----- --------------- ---------------------------- -------------------------" echo "--- ---- --------------- ---------------------------- -------------------------"
for ezjail in ${ezjail_list}; do for ezjail in ${ezjail_list}; do
fetchjailinfo ${ezjail%.norun} fetchjailinfo ${ezjail%.norun}
case ${ezjail_imagetype} in simple) ezjail_state="I";; bde) ezjail_state="B";; eli) ezjail_state="E";; *) ezjail_state="D";; esac 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)
TIFS=${IFS}; IFS=,; unset _multiline TIFS=${IFS}; IFS=,; unset _multiline
for ezjail_ip in ${ezjail_ips}; do for ezjail_ip in ${ezjail_ips}; do
if [ -z "${_multiline}" ]; then if [ -z "${_multiline}" ]; then
printf "%-3s %-5s %-15s %-28s %s\\n" "${ezjail_state}" "${ezjail_id:-N/A}" "${ezjail_ip}" "${ezjail_hostname}" "${ezjail_rootdir}" printf "%-3s %-4s %-15s %-30s %s\\n" "${ezjail_state}" "${ezjail_id:-N/A}" "${ezjail_ip}" "${ezjail_hostname}" "${ezjail_rootdir}"
_multiline=yes _multiline=yes
else else
echo " ${ezjail_ip}" echo " ${ezjail_ip}"
@ -1392,7 +1392,6 @@ config)
fi fi
case "${ezjail_setrunnable}" in case "${ezjail_setrunnable}" in
run) [ "${ezjail_config}" = "${ezjail_config%.norun}" ] || mv "${ezjail_config}" "${ezjail_config%.norun}";; run) [ "${ezjail_config}" = "${ezjail_config%.norun}" ] || mv "${ezjail_config}" "${ezjail_config%.norun}";;
norun) [ "${ezjail_config}" = "${ezjail_config%.norun}" ] && mv "${ezjail_config}" "${ezjail_config}.norun" ;; norun) [ "${ezjail_config}" = "${ezjail_config%.norun}" ] && mv "${ezjail_config}" "${ezjail_config}.norun" ;;