Changeset 217 for drbl-virt

Timestamp:

Oct 19, 2010, 5:13:45 PM (14 years ago)

Author:

rock

Message:

Add: KVM support (bridge to eth for KVM env)

Location:

drbl-virt

Files:

• install.sh (modified) (1 diff)
• sbin/drbl_bridge_kvm_patch (added)
• sbin/drbl_bridge_xen_patch (moved) (moved from drbl-virt/sbin/drbl_bridge_patch.sh) (4 diffs)
• sbin/drbl_kvm_patch.sh (modified) (3 diffs)
• sbin/drbl_xen_patch.sh (modified) (1 diff)
• tar_drbl-virt.sh (modified) (1 diff)

drbl-virt/install.sh

@@ -24 +24 @@
 jude="no"
 if [ -e $Work_Home ]; then
-    echo "This system already has drbl-virt."
+    echo -e "\nThis system already has drbl-virt."
     read -p "Do you want to install, again (yes/no): " jude
 

drbl-virt/sbin/drbl_bridge_xen_patch

@@ -1 +1 @@
 #!/bin/bash
 # Program:
-#   Patch DRBL to bridge eth in booting
+#   Patch DRBL to bridge eth in booting (Xen)
 # Author: 
 #   Jazz, Rock {jazz, rock}@nchc.org.tw
@@ -17 +17 @@
 # = 1. Patch DRBL initrd to support bridge =
 # == Patch /usr/bin/mkpxeinitrd-net (1)Xen network scripts (2)command (3)modules ==
-# backup mkpxeinitrd-net. if already has "drbl-virt add", dones't sed
+# backup mkpxeinitrd-net. if already has "drbl-virt add", doesn't sed
 cat /usr/bin/mkpxeinitrd-net | grep "# drbl-virt add" >> /dev/null
 if [ $? != 0 ]; then
@@ -43 +43 @@
 # drbl-virt add
 NICs=\$(/sbin/ifconfig | grep eth | awk '{print \$1}')
-declare -i NICs_nu=\$(echo \$NICs |wc -l)
+declare -i NICs_nu=\$(echo \$NICs |wc -w)
 NIC=""
 
@@ -49 +49 @@
     for (( i=0 ; i<\$NICs_nu ; i++ ))
     do
-        NIC_IP=\$(ifconfig eth\${i} | grep "inet addr" | sed 's/inet addr://g' | sed 's/Bcast.*$//g')
+        NIC_IP=\$(ifconfig eth\${i} | grep "inet addr" | sed 's/inet addr://g' | sed 's/Bcast.*$//g' | sed 's/^[ ]*//')
         if [ -n \$NIC_IP ]; then
             NIC="eth\${i}"

drbl-virt/sbin/drbl_kvm_patch.sh

@@ -43 +43 @@
 sed -i "${modify_line}i\  # MENU HIDE" $generate_PXE_menu
 modify_line=$modify_line+1
-sed -i "${modify_line}i\  MENU LABEL DRBL-Virtualization ($KVM_Kernel)" $generate_PXE_menu
+sed -i "${modify_line}i\  MENU LABEL DRBL-Virtualization (KVM $KVM_Kernel)" $generate_PXE_menu
 modify_line=$modify_line+1
 sed -i "${modify_line}i\  kernel vmlinuz-pxe" $generate_PXE_menu
 modify_line=$modify_line+1
-sed -i "${modify_line}i\  append  initrd=initrd-pxe.img devfs=nomount drblthincli=off selinux=0 nomodeset"
+sed -i "${modify_line}i\  append  initrd=initrd-pxe.img devfs=nomount drblthincli=off selinux=0 nomodeset" $generate_PXE_menu
 modify_line=$modify_line+1
 sed -i "${modify_line}i\  TEXT HELP" $generate_PXE_menu
@@ -59 +59 @@
 # = 2. Patch DRBL initrd to support bridge =
 # == Patch /usr/bin/mkpxeinitrd-net (1)Xen network scripts (2)command (3)modules ==
-# backup mkpxeinitrd-net. if already has "drbl-virt add", dones't sed
-source $Work_Path/drbl_bridge_patch.sh
+# backup mkpxeinitrd-net. if already has "drbl-virt add", doesn't sed
+source $Work_Path/drbl_bridge_kvm_patch
 
 
@@ -77 +77 @@
 #!/bin/sh                 
 echo -n "Loading kvm module..."
-if $(/sbin/modprobe kvm)
+if \$(/sbin/modprobe kvm)
     then
         echo "[SUCCESS]:"

drbl-virt/sbin/drbl_xen_patch.sh

@@ -68 +68 @@
 # == Patch /usr/bin/mkpxeinitrd-net (1)Xen network scripts (2)command (3)modules ==
 # backup mkpxeinitrd-net. if already has "drbl-virt add", dones't sed
-source $Work_Path/drbl_bridge_patch.sh
+source $Work_Path/drbl_bridge_xen_patch
 
 # = 3. enable xend xendomains daemon in DRBL Client =

drbl-virt/tar_drbl-virt.sh

@@ +1 @@
+#!/bin/bash
+
+# [Version Setup]
+version="0.1"
+
+# [Main]
 cd ../
-tar zcvf drbl-virt-0.1$(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 drbl-virt