Changeset 189 for drbl-virt

Timestamp:

Aug 26, 2010, 8:42:04 PM (14 years ago)

Author:

rock

Message:

Bugfix:

Location:

drbl-virt/sbin

Files:

• drbl_xen_patch.sh (modified) (1 diff)
• drbl_xen_repush.sh (modified) (1 diff)
• duplicate_del_MAC (modified) (1 diff)
• functions_drbl_virt (modified) (2 diffs)

drbl-virt/sbin/drbl_xen_patch.sh

@@ -44 +44 @@
 declare -i modify_line=$(cat -n $generate_PXE_menu | grep 'label drbl' | awk 'NR==1 {print $1}')
 # delete default
-sed -i 's/^  MENU DEFAULT/  # MENU DEFAULT/d' $generate_PXE_menu
+sed -i 's/^  MENU DEFAULT/  # MENU DEFAULT/g' $generate_PXE_menu
 # modify menu
 sed -i "${modify_line}i\label drbl-virt" $generate_PXE_menu

drbl-virt/sbin/drbl_xen_repush.sh

@@ -58 +58 @@
     VM_MACs=$(cat /opt/drbl-virt/etc/macadr-VM-$eth.txt)
 
-    echo -e "VM_IPs=$VM_IPs \n VM_IPs_nu=$VM_IPs_nu \n VM_hosts=$VM_hosts \n VM_MACs=$VM_MACs"
+    #echo -e "VM_IPs=$VM_IPs \n VM_IPs_nu=$VM_IPs_nu \n VM_hosts=$VM_hosts \n VM_MACs=$VM_MACs"
 
     # delete duplicating value(ip,hostname) in IP_HOST_TABLE
-    if [ -e /etc/drbl/IP_HOST_TABLE ]; then
-    $Work_Path/duplicate_del /etc/drbl/IP_HOST_TABLE
-    fi
+    #if [ -e /etc/drbl/IP_HOST_TABLE ]; then
+    #$Work_Path/duplicate_del /etc/drbl/IP_HOST_TABLE
+    #fi
     # add ip & hostname
-    $Work_Path/add_value /opt/drbl-virt/etc/IP_VM_$eth /etc/drbl/IP_HOST_TABLE $eth
+    #$Work_Path/add_value /opt/drbl-virt/etc/IP_VM_$eth /etc/drbl/IP_HOST_TABLE $eth
+    
+    # == delete duplicating MAC ==
     
     # == Add Mac address to macadr-ethX.txt ==
     if [ -e /etc/drbl/macadr-$eth.txt ]; then
-    $Work_Path/duplicate_del_MAC /etc/drbl/macadr-$eth.txt
+    delete_duplicating_MAC
     fi
     cat /opt/drbl-virt/etc/macadr-VM-$eth.txt >> /etc/drbl/macadr-$eth.txt

drbl-virt/sbin/duplicate_del_MAC

@@ -15 +15 @@
 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)

drbl-virt/sbin/functions_drbl_virt

@@ -292 +292 @@
 
 # generate MAC
-for (( i=0 ; i<="$VM_Host_totoal_nu" ; i++ ))
+for (( i=1 ; i<"$VM_Host_totoal_nu" ; i++ ))
 do
     if [ $i -lt 10 ]; then
@@ -325 +325 @@
 #done
 #}
+
+function delete_duplicating_MAC(){
+# backup
+drbl_mac_file="/etc/drbl/macadr-$eth.txt"
+cp $drbl_mac_file $drbl_mac_file.$(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 $drbl_mac_file | grep $vm_mac | awk '{print $1}' )
+    read -p "DEBUG vm_mac_lines $vm_mac_lines"
+    # no duplicated vlaue, doesn't do it
+    if [ -n "$vm_mac_lines" ]; then
+        vm_mac_count=$(echo $vm_mac_lines | wc -w)
+        read -p "de vm_mac_count $vm_mac_count"
+        for (( i=1 ; i<=${vm_mac_count} ; i++ ))
+        do
+            del_line=$(echo $vm_mac_lines | cut -d " " -f${i})
+            sed -i "${del_line}d" $drbl_mac_file
+        done
+        bash
+    fi
+done
+}  
+