[PC-BSD Commits] r16059 - in pcbsd/current/src-qt4/warden: conf scripts/backend

[svn at pcbsd.org]

Author: kris
Date: 2012-03-28 15:38:38 +0000 (Wed, 28 Mar 2012)
New Revision: 16059

Modified:
   pcbsd/current/src-qt4/warden/conf/warden.conf
   pcbsd/current/src-qt4/warden/scripts/backend/details.sh
Log:

Make warden details IPv6 happy



Modified: pcbsd/current/src-qt4/warden/conf/warden.conf
===================================================================
--- pcbsd/current/src-qt4/warden/conf/warden.conf	2012-03-28 13:56:38 UTC (rev 16058)
+++ pcbsd/current/src-qt4/warden/conf/warden.conf	2012-03-28 15:38:38 UTC (rev 16059)
@@ -3,7 +3,7 @@
 ######################################################################
 
 # Network Interface for the jails to use
-NIC: em0
+NIC: re0
 
 # Directory to use for compressing / decompressing files 
 WTMP: /tmp

Modified: pcbsd/current/src-qt4/warden/scripts/backend/details.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/details.sh	2012-03-28 13:56:38 UTC (rev 16058)
+++ pcbsd/current/src-qt4/warden/scripts/backend/details.sh	2012-03-28 15:38:38 UTC (rev 16059)
@@ -33,7 +33,7 @@
 #####################################################################
 echo "Details for jail: ${IP}"
 diskUsage=`du -c -x -m ${JDIR}/${IP} 2>/dev/null | grep total | tail -n 1 | awk '{print $1}'`
-sockstat | grep ${IP} | grep '*.*' | awk '{print $6}' | cut -d ":" -f 2  | sort -g >/tmp/.socklist.$$
+sockstat | grep "${IP}" | grep '*.*' | awk '{print $6}' | sed "s|${IP}:||g" | sort -g >/tmp/.socklist.$$
 while read line
 do
   if [ -z "$portList" ] ; then
@@ -43,7 +43,7 @@
   fi
 done < /tmp/.socklist.$$
 rm /tmp/.socklist.$$
-activeCon=`sockstat | grep ${IP} | grep -v '*.*' | wc -l | awk '{print $1}'`
+activeCon=`sockstat | grep "${IP}" | grep -v '*.*' | wc -l | awk '{print $1}'`
 
 echo "Disk Usage: ${diskUsage}MB"
 echo "Active Ports: ${portList}"