First release of a xen plugin. Only a few diskless corrections inside. Works only with clone and an already installed xen. Karnel has to be chosen manually yet... a solution for runlevellinks in plugins has to be found.

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1873 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 6 insertions, 33 deletions

diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 22e313f8..83992869 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -143,32 +143,6 @@ local i
 echo $n
 }
 #############################################################################
-# configure Xen bridge xenbr0
-xenbr_config () {
-modprobe ${MODPRV} netloop
-local ipls
-local vifnum="0"
-local bridge="xenbr${vifnum}"
-local netdev="eth${vifnum}"
-local pdev="p${netdev}"
-local vdev="veth${vifnum}"
-local vif0="vif0.${vifnum}"
-# fixme: that is the mac address of main ethernet device
-local mac=$macaddr
-
-brctl addbr ${bridge}
-brctl stp ${bridge} off
-brctl setfd ${bridge} 0
-brctl addif ${bridge} ${vif0}
-for ipls in "${netdev} name ${pdev}" "${vdev} name ${netdev}" \
-            "${pdev} down arp off" "${pdev} addr fe:ff:ff:ff:ff:ff" \
-            "${netdev} addr ${mac} arp on" "${netdev} addr ${mac} arp on" \
-            "${bridge} up" "${vif0} up" "${pdev} up" ; do
-  ip link set ${ipls}
-done
-brctl addif ${bridge} ${pdev}
-}
-#############################################################################
 # replace @@@serverip@@@ with real serverip. Allows the usage of a variable
 # for the server ip address (e.g. in machine-setup or kernel commandline)
 checkip ()
@@ -358,7 +332,7 @@ fileget () {
 local cfgfile
 [ "x$fileprot" = "x" ] && fileprot=tftp
 if [ "x$filepath" != "x" ] ; then
-  cfgfile=${filepath}
+  cfgfile="${filepath}"
   [ "x$fileserv" = "x" ] && fileserv=$(checkip ${serverip})
   case "$fileprot" in
    ftp|http)
@@ -372,12 +346,12 @@ if [ "x$filepath" != "x" ] ; then
      mkdir /tmp/$ldev
      echo -e "ext2\nreiserfs\nvfat\nxfs" >/etc/filesystems
      mount -o ro /dev/$ldev /tmp/$ldev || error "$init_errlfg"
-     unpack /tmp/$ldev/$cfgfile
+     unpack /tmp/$ldev/"$cfgfile"
      umount /dev/$ldev
    ;;
    *)
-     tftp -g -r $cfgfile -l /tmp/$(basename $cfgfile) $fileserv  \
-       && unpack /tmp/$(basename $cfgfile)
+     tftp -g -r '$cfgfile' -l /tmp/$(basename "$cfgfile") "$fileserv"  \
+       && unpack /tmp/$(basename "$cfgfile")
    ;;
    esac
 else
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index d016124b..123abc86 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -346,6 +346,8 @@ else
   ip link show dev eth1 >/dev/null 2>&1 && error "$init_2eif" nonfatal
 fi
 
+runinithook '10-have-nw-modules'
+
 # set up loopback networking
 [ $DEBUGLEVEL -eq 20 ] && echo "** starting ip config at $(sysup)"
 ip link set dev lo up
@@ -354,9 +356,6 @@ ip link set dev $nwif up || error "$init_noeth"
 macaddr=$(ip link show dev $nwif|sed -n "/ether [0-9e-f]\{2\}:.*/p" \
   |sed -e "s/.*ether //;s/ .*//")
 
-# XEN bridge config
-[ -n "$xenbr" ] && xenbr_config
-
 # analyze ip information from the kernel command line and put parts
 # of it into several variables
 if [ -n "$ipinfo" ] ; then