Changes between Version 1 and Version 2 of jazz/11-09-27


Ignore:
Timestamp:
Sep 27, 2011, 2:06:12 AM (13 years ago)
Author:
jazz
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • jazz/11-09-27

    v1 v2  
    1111> stp                     1440  1 bridge
    1212}}}
     13{{{
     14#!diff
     15--- /usr/bin/mkpxeinitrd-net.drbl-virt_bak      2011-09-27 02:48:49.000000000 +0800
     16+++ /usr/bin/mkpxeinitrd-net    2011-09-27 02:35:36.000000000 +0800
     17@@ -37,7 +37,8 @@
     18 # uncompress the compress kernel module. This is special for Mandriva case. It uses compressed kernel module, e.g. pcnet32.ko.gz. Before we used modprobe from busybox, we have to uncompress that. Now the modprobe program is from the OS (See variable include_bin_prog_from_server), so we should allow this type of kernel modules.
     19 use_compressed_kernel_module="yes"
     20 # Some required bin programs to be included in the PXE initrd, which are not provided by busybox or the one provided by busybox does not support the function we want. E.g. sleep (we need "sleep 0.1", while sleep from busybox does not support 0.1 secs).
     21-include_bin_prog_from_server="sleep lspci insmod modprobe rmmod lsmod pkill strings mount umount mount.nfs umount.nfs"
     22+# drbl-virt add
     23+include_bin_prog_from_server='sleep lspci insmod modprobe rmmod lsmod pkill strings brctl ip egrep awk gawk seq fgrep dirname expr bash'
     24 
     25 # No need to use sudo if we are root
     26 if [ $UID -eq 0 ]; then
     27@@ -303,6 +304,9 @@
     28      cp -a --parents $i $initrd/lib/modules/$kernel_ver/
     29    done
     30 
     31+# drbl-virt add
     32+cp -a --parents kernel/net/bridge/bridge.ko $initrd/lib/modules/$kernel_ver/
     33+cp -a --parents kernel/drivers/xen/netback/netloop.ko $initrd/lib/modules/$kernel_ver/
     34    # Deal with firmwares!
     35    # The following is borrowed from Debian's /usr/share/initramfs-tools/hook-functions
     36    if [ "$copy_all_firmwares" = "yes" ]; then
     37}}}
     38{{{
     39#!diff
     40--- /usr/lib/mkpxeinitrd-net/initrd-skel/linuxrc-or-init.drbl-virt_bak  2011-09-27 02:35:36.000000000 +0800
     41+++ /usr/lib/mkpxeinitrd-net/initrd-skel/linuxrc-or-init        2011-09-27 02:35:36.000000000 +0800
     42@@ -244,6 +244,8 @@
     43   done
     44 done
     45 
     46+# drbl-virt add
     47+bash /bin/start_xen_bridge.sh
     48 # clean the tag file
     49 [ -f "/dev/sname" ] && rm -f /dev/sname
     50}}}