Index: drbl-virt/sbin/add_value
===================================================================
--- drbl-virt/sbin/add_value	(revision 203)
+++ 	(revision )
@@ -1,21 +1,0 @@
-#!/bin/bash                                                                                                      
-# Program:
-#   Add ip & hostname($1) to $2
-#   $1=/opt/drbl-virt/etc/IP_VM_ethX
-#   $2=/etc/drbl/IP_HOST_TABLE
-# Author: 
-#   rock@nchc.org.tw
-# Version:
-#    1.0
-# History:
-#   2010/06/07  Rock    First release (1.0)
-
-
-# delete
-sed -i "/# drbl-virt $3 add/d" $2
-sed -i "/# drbl-virt $3 end/d" $2
-
-#
-echo "# drbl-virt $3 add" >> $2
-cat $1 >> $2
-echo "# drbl-virt $3 end" >> $2
Index: drbl-virt/sbin/check_drbl_client.sh
===================================================================
--- drbl-virt/sbin/check_drbl_client.sh	(revision 203)
+++ drbl-virt/sbin/check_drbl_client.sh	(revision 204)
@@ -37,5 +37,6 @@
         client_CPU_core=$(ssh -o StrictHostKeyChecking=no $client_IP "cat /proc/cpuinfo |grep processor | wc -l")
         # check top information
-        ssh -o StrictHostKeyChecking=no $client_IP "top -b -n1" > $drbl_client_top_file
+        ssh -o StrictHostKeyChecking=no $client_IP "top -b -n2 -d1 | awk '/^top/{i++}i==2'" > $drbl_client_top_file
+IP_VM_right_line=""
         client_idle_CPU=$(cat $drbl_client_top_file | grep ^Cpu | sed 's/^.*ni,//' | sed 's/id,.*$//'  | awk '{print $1}')
         client_Ram=$(cat $drbl_client_top_file | grep ^Mem | sed 's/total.*$//' | sed 's/^Mem://' | awk '{print $1}')
@@ -45,5 +46,5 @@
 
 echo "[$client_hostname $client_IP] $IP_status CPU_Core=$client_CPU_core Ram=$client_Ram idle_CPU=$client_idle_CPU unused_Ram=$client_unused_Ram"
-echo "[$client_hostname $client_IP] $IP_status $client_CPU_core $client_Ram $client_idle_CPU $client_unused_Ram" >> $drbl_client_file
+#echo "[$client_hostname $client_IP] $IP_status $client_CPU_core $client_Ram $client_idle_CPU $client_unused_Ram" >> $drbl_client_file
 
 done
Index: drbl-virt/sbin/check_drbl_vm.sh
===================================================================
--- drbl-virt/sbin/check_drbl_vm.sh	(revision 203)
+++ drbl-virt/sbin/check_drbl_vm.sh	(revision 204)
@@ -36,8 +36,8 @@
     
     if [ $IP_status == "online" ]; then
-        ssh -o StrictHostKeyChecking=no $client_IP "xentop -b -i1" > $drbl_vm_xentop_file
+        ssh -o StrictHostKeyChecking=no $client_IP "xentop -d1 -b -i2 | awk '/^.*NAME/{i++}i==2'" > $drbl_vm_xentop_file
         vm_hostnames="$(cat $drbl_vm_xentop_file | sed -n '3,$p' | awk '{print $1}')"
     
-        printf "[$client_hostname] " >> $drbl_vm_file
+#        printf "[$client_hostname] " >> $drbl_vm_file
         printf "[$client_hostname] "
         declare -i i=1
@@ -45,5 +45,5 @@
         vm_numbers=$(echo $vm_hostnames | wc -w)
 
-        printf "[Running VM: $vm_numbers]\n" >> $drbl_vm_file
+#        printf "[Running VM: $vm_numbers]\n" >> $drbl_vm_file
         printf "[Running VM: $vm_numbers]\n"
 
@@ -54,5 +54,5 @@
             vm_CPU_loading="$(cat $drbl_vm_xentop_file | grep $vm_hostname | awk '{print $4}')"
             vm_Ram_loading="$(cat $drbl_vm_xentop_file | grep $vm_hostname | awk '{print $6}')"
-            printf "VM$i: $vm_hostname $vm_CPU_core ${vm_Ram}K $vm_CPU_loading%% $vm_Ram_loading%%\n" >> $drbl_vm_file
+#            printf "VM$i: $vm_hostname $vm_CPU_core ${vm_Ram}K $vm_CPU_loading%% $vm_Ram_loading%%\n" >> $drbl_vm_file
             printf "VM$i: $vm_hostname VCPU=$vm_CPU_core Mem=${vm_Ram}K VCPU_loading=$vm_CPU_loading%% Mem_usage=$vm_Ram_loading%%\n"
             i=i+1
Index: drbl-virt/sbin/drbl_PXE_PV-VM_create.sh
===================================================================
--- drbl-virt/sbin/drbl_PXE_PV-VM_create.sh	(revision 203)
+++ drbl-virt/sbin/drbl_PXE_PV-VM_create.sh	(revision 204)
@@ -127,5 +127,5 @@
 #IP_MAC_files=$(ls $Work_Home/etc | grep 'macadr-VM-eth[0-9]*.txt')
 
-IP_VM_files=$(ls $Work_Home/IP_VM_eth[0-9]*)
+IP_VM_files=$(ls $Work_Home/etc | grep 'IP_VM_eth[0-9]*')
 IP_VM_right_file=""
 IP_VM_right_line=""
Index: drbl-virt/sbin/duplicate_del_MAC
===================================================================
--- drbl-virt/sbin/duplicate_del_MAC	(revision 203)
+++ 	(revision )
@@ -1,34 +1,0 @@
-#!/bin/bash
-# Program:
-#   Delete duplicating VM MAC
-# Author: 
-#   Rock {waue, shunfa, rock}@nchc.org.tw
-# Version:
-#    1.0
-# History:
-#   2010/08/26  Rock    First release (1.0)
-
-# 刪掉空白行
-#sed -i '/^$/d' "$1"
-
-#read -p "cp - f $1 ${1}.old ; $?"
-cp $1 $1.$(date +%Y-%m-%d-%H-%M-%S).drbl-virt_bak 
-
-read -p "debug $VM_MACs"
-# Delete duplating VM MAC
-for vm_mac in $(echo $VM_MACs)
-do
-    vm_mac_lines=$(cat -n $1 | grep $vm_mac | awk '{print $1}' )
-    # no duplicated vlaue, doesn't do it
-    if [ -n $vm_mac_lines ]; then
-        vm_mac_count=$(echo $vm_mac_lines | wc -w)
-
-        for (( i=1; i<=${VM_mac_count}; i++ ))
-        do
-            del_line=$(echo $vm_mac_lines | cut -d " " -f${i})
-            sed -i "${del_line}d" $1
-        done
-    fi
-done
-  
-
Index: drbl-virt/sbin/functions_drbl_virt
===================================================================
--- drbl-virt/sbin/functions_drbl_virt	(revision 203)
+++ drbl-virt/sbin/functions_drbl_virt	(revision 204)
@@ -112,5 +112,5 @@
     declare -i j=1
     echo ""
-    echo "Choose Xen-enabled Kernel"
+    echo "[Choose Xen-enabled Kernel]"
     if [ $Kernels_nu -gt 1  ]; then
         for Kernel in $Kernels
@@ -190,4 +190,5 @@
 function get_VM_IP_range_and_prefix_name(){
 echo ""
+echo "[Setup VM IP range]"
 echo "DRBL client IP range -> $eth: [$Host_first_IP ~ $Host_last_IP]"
 
