Changeset 218

Timestamp:

Oct 20, 2010, 11:10:46 AM (14 years ago)

Author:

rock

Message:

Milestone: KVM Support (Bridge patch)

Location:

drbl-virt

Files:

• sbin/drbl_bridge_kvm_patch (modified) (2 diffs)
• sbin/drbl_bridge_xen_patch (modified) (1 diff)
• tar_drbl-virt.sh (modified) (1 diff)

drbl-virt/sbin/drbl_bridge_kvm_patch

@@ -21 +21 @@
 if [ $? != 0 ]; then
 cp /usr/bin/mkpxeinitrd-net /usr/bin/mkpxeinitrd-net.drbl-virt_bak
+# copy Xen network scripts
+cp $Work_Home/conf/initrd_bin/network-bridge /usr/lib/mkpxeinitrd-net/initrd-skel/bin/
+cp $Work_Home/conf/initrd_bin/xen-network-common.sh /usr/lib/mkpxeinitrd-net/initrd-skel/bin/
+cp $Work_Home/conf/initrd_bin/xen-script-common.sh /usr/lib/mkpxeinitrd-net/initrd-skel/bin/
 
 # patch it to copy command
@@ -37 +41 @@
 #!/bin/bash
 # drbl-virt add
-NICs=$(/sbin/ifconfig | grep eth | awk '{print $1}')
-declare -i NICs_nu=$(echo $NICs |wc -w)
+NICs=\$(/sbin/ifconfig | grep eth | awk '{print \$1}')
+declare -i NICs_nu=\$(echo \$NICs |wc -w)
  
-for NIC in $NICs
+for NIC in \$NICs
 do
-    NIC_IP=$(ifconfig $NIC | grep "inet addr" | sed 's/inet addr://g' | sed 's/Bcast.*$//g' | sed 's/^[ ]*//')
+    NIC_IP=\$(ifconfig \$NIC | grep "inet addr" | sed 's/inet addr://g' | sed 's/Bcast.*$//g' | sed 's/^[ ]*//')
 
-    if [ -n $NIC_IP ]; then
+    if [ -n \$NIC_IP ]; then
         break
     fi
 done
 
-# add bridge and bridge to eth
-/bin/brctl addbr br0
-/bin/brctl addif br0 \$NIC
-/bin/ifconfig \$NIC 0.0.0.0 up
-/bin/ifconfig br0 \$NIC_IP up
+# add bridge to eth
+bash /bin/network-bridge start netdev=\$NIC 
 EOF
 fi

drbl-virt/sbin/drbl_bridge_xen_patch

@@ -22 +22 @@
 cp /usr/bin/mkpxeinitrd-net /usr/bin/mkpxeinitrd-net.drbl-virt_bak
 # copy Xen network scripts
-cp /etc/xen/scripts/network-bridge /usr/lib/mkpxeinitrd-net/initrd-skel/bin/
-cp /etc/xen/scripts/xen-network-common.sh /usr/lib/mkpxeinitrd-net/initrd-skel/bin/
-cp /etc/xen/scripts/xen-script-common.sh /usr/lib/mkpxeinitrd-net/initrd-skel/bin/
+cp $Work_Home/conf/initrd_bin/network-bridge /usr/lib/mkpxeinitrd-net/initrd-skel/bin/
+cp $Work_Home/conf/initrd_bin/xen-network-common.sh /usr/lib/mkpxeinitrd-net/initrd-skel/bin/
+cp $Work_Home/conf/initrd_bin/xen-script-common.sh /usr/lib/mkpxeinitrd-net/initrd-skel/bin/
 # patch it to copy command
 declare -i modify_line=$(cat -n /usr/bin/mkpxeinitrd-net | grep 'include_bin_prog_from_server=' | awk '{print $1}')

drbl-virt/tar_drbl-virt.sh

@@ -6 +6 @@
 # [Main]
 cd ../
-tar zcvf drbl-virt-${version}_$(date +%Y-%m-%d-%H-%M-%S).tar.gz drbl-virt
+tar zcvf drbl-virt-${version}_$(date +%Y-%m-%d-%H-%M-%S).tar.gz --exclude=.svn  drbl-virt