annoying warning from demuxer removed, has to be solved otherwise

virtualization plugin refurbished
virtualbox can boot now 64 bit guests on 32 bit hosts

7 files changed, 247 insertions, 103 deletions

diff --git a/os-plugins/plugins/vmchooser/XX_vmchooser.sh b/os-plugins/plugins/vmchooser/XX_vmchooser.sh
index 35d17a2e..168bcda1 100644
--- a/os-plugins/plugins/vmchooser/XX_vmchooser.sh
+++ b/os-plugins/plugins/vmchooser/XX_vmchooser.sh
@@ -51,32 +51,6 @@ if [ -e $CONFFILE ]; then
     mount -n -t msdos -o loop,umask=000 ${PLUGINCONFDIR}/loopimg/fd.img \
       ${PLUGINCONFDIR}/fd-loop
 
-    # create run-virt.include header (and fill in information on removable
-    # devices if present
-    echo -e "# run-virt.include created by $0 during stage3 plugin setup" \
-      >${PLUGINCONFDIR}/run-virt.include
-
-    waitfor /etc/hwinfo.cdrom
-    j=0
-    for i in $(cat /etc/hwinfo.cdrom); do
-      echo "cdrom_$j=$i" >>${PLUGINCONFDIR}/run-virt.include
-      j=$(expr $j + 1)
-    done
-
-    waitfor /etc/hwinfo.floppy
-    j=0
-    for i in $(cat /etc/hwinfo.floppy); do
-      echo "floppy_$j=$i" >>${PLUGINCONFDIR}/run-virt.include
-      j=$(expr $j + 1)
-    done
-    
-    CPU_CORES=$(grep 'processor.*:' /proc/cpuinfo | wc -l)
-    if [ "${CPU_CORES}" -gt "1" 2>/dev/null ]; then
-      echo "cpu_cores=\"${CPU_CORES}\"" >>${PLUGINCONFDIR}/run-virt.include
-    else
-      echo 'cpu_cores="1"' >>${PLUGINCONFDIR}/run-virt.include
-    fi
-
     # finished ...
     [ $DEBUGLEVEL -gt 0 ] && echo "done with 'vmchooser' os-plugin ..."
   fi
diff --git a/os-plugins/plugins/vmchooser/files/run-virt.sh b/os-plugins/plugins/vmchooser/files/run-virt.sh
index 9bc31396..adfc737e 100644
--- a/os-plugins/plugins/vmchooser/files/run-virt.sh
+++ b/os-plugins/plugins/vmchooser/files/run-virt.sh
@@ -22,8 +22,9 @@
 . /etc/opt/openslx/openslx.conf
 PLUGINCONFROOT=${OPENSLX_DEFAULT_CONFDIR}/plugins
 PLUGINCONFDIR=${PLUGINCONFROOT}/vmchooser
-# include general configuration from vmchooser
-. ${PLUGINCONFDIR}/run-virt.include
+# load general virtualization information
+[ -f ${PLUGINCONFROOT}/virtualization/virtualization.conf ] && \
+  . ${PLUGINCONFROOT}/virtualization/virtualization.conf
 
 # Sanity checks
 ################################################################################
diff --git a/os-plugins/plugins/vmchooser/init-hooks/80-after-plugins/virtualization.sh b/os-plugins/plugins/vmchooser/init-hooks/80-after-plugins/virtualization.sh
new file mode 100644
index 00000000..8c241b8b
--- /dev/null
+++ b/os-plugins/plugins/vmchooser/init-hooks/80-after-plugins/virtualization.sh
@@ -0,0 +1,114 @@
+# Copyright (c) 2008..2010 - RZ Uni Freiburg
+# Copyright (c) 2008..2010 - OpenSLX GmbH
+#
+# This program/file is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your feedback to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org
+#
+# script is included from init via the "." load function - thus it has all
+# variables and functions available
+
+# virtual virtualization plugin
+# make sure that this file is the same in vmgrid and vmchooser plugin!
+
+# include default directories
+. /etc/openslx.conf
+
+CONFFILEVMCHOOSER="/initramfs/plugin-conf/vmchooser.conf"
+CONFFILEVMGRID="/initramfs/plugin-conf/vmgrid.conf"
+PLUGINCONFDIR=/mnt/${OPENSLX_DEFAULT_CONFDIR}/plugins/virtualization
+
+# check if plugins available
+active=0
+[ -f ${CONFFILEVMCHOOSER} ] && . ${CONFFILEVMCHOOSER}
+[ -n "${CONFFILEVMCHOOSER}" ] && active=1
+[ -f ${CONFFILEVMGRID} ] && . ${CONFFILEVMGRID}
+[ -n "${CONFFILEVMGRID}" ] && active=1
+
+[ $DEBUGLEVEL -gt 0 ] \
+  && echo "Executing the virtual 'virtualization' plugin ..."
+
+if [ ${active} -ne 0 ] ; then
+
+  # load general configuration
+  . /etc/initramfs-setup
+  # include functions
+  . /etc/functions
+
+  testmkd ${PLUGINCONFDIR}
+
+  # check if vmgrid active and change free mem
+  totalmem=$(expr $(grep -i "memtotal" /proc/meminfo \
+             | awk '{print $2}') / 1024)
+  echo "totalmem=${totalmem}" >> ${PLUGINCONFDIR}/virtualization.conf
+  if [ ${vmgrid_active} -ne 0 ]; then
+    totalmemtest=$(expr $(echo ${vmgrid_memratio} \
+                  | awk -F ',' '{print $1" + "$2" + "$3" + "$4" + "$5" + "$6}'))
+    if [ ${totalmemtest} -le 100 2>/dev/null ]; then
+      # get hostmem
+      freememper=$(expr 100 - $(echo ${vmgrid_memratio} \
+                   | awk -F ',' '{print $1" - "$2" - "$3" - "$4}'))
+      freemem=$(expr ${totalmem} \* ${freememper} / 100)
+      echo "freemem=${freemem}" \
+        >> ${PLUGINCONFDIR}/virtualization.conf
+    else
+      # more than 100% memory assigned stupid!
+      # vmgrid will get this as well and exit!
+      # so we have theoretically 100% free
+      echo "freemem=${totalmem}" \
+        >> ${PLUGINCONFDIR}/virtualization.conf
+    fi
+  else
+    echo "freemem=${totalmem}" \
+      >> ${PLUGINCONFDIR}/virtualization.conf
+fi
+
+  # cpu cores
+  CPU_CORES=$(grep 'processor.*:' /proc/cpuinfo | wc -l)
+  if [ "${CPU_CORES}" -gt "1" 2>/dev/null ]; then
+    echo "cpu_cores=${CPU_CORES}" \
+      >> ${PLUGINCONFDIR}/virtualization.conf
+  else
+    echo 'cpu_cores=1' >> ${PLUGINCONFDIR}/virtualization.conf
+  fi
+
+  # arch
+  echo "host_arch=$(uname -m)" >> ${PLUGINCONFDIR}/virtualization.conf
+
+  # VT enabled cpu?
+  if grep -q ^flags.*\\\<vmx\\\> /proc/cpuinfo; then
+    echo "vtflag=1" >> ${PLUGINCONFDIR}/virtualization.conf
+    echo 'kvm_module="kvm_intel"' >> ${PLUGINCONFDIR}/virtualization.conf
+  elif grep -q ^flags.*\\\<svm\\\> /proc/cpuinfo; then
+    echo "vtflag=1" >> ${PLUGINCONFDIR}/virtualization.conf
+    echo 'kvm_module="kvm_amd"' >> ${PLUGINCONFDIR}/virtualization.conf
+  else
+    echo "vtflag=0" >> ${PLUGINCONFDIR}/virtualization.conf
+  fi
+
+  # get further hw information
+  waitfor /etc/hwinfo.cdrom
+  j=0
+  for i in $(cat /etc/hwinfo.cdrom); do
+    echo "cdrom_$j=$i" >> ${PLUGINCONFDIR}/virtualization.conf
+    j=$(expr $j + 1)
+  done
+
+  waitfor /etc/hwinfo.floppy
+  j=0
+  for i in $(cat /etc/hwinfo.floppy); do
+    echo "floppy_$j=$i" >> ${PLUGINCONFDIR}/virtualization.conf
+    j=$(expr $j + 1)
+  done
+
+  # finished ...
+  [ $DEBUGLEVEL -gt 0 ] \
+    && echo " ok"
+else
+  [ $DEBUGLEVEL -gt 0 ] \
+    && echo " failed"
+fi
diff --git a/os-plugins/plugins/vmgrid/XX_vmgrid.sh b/os-plugins/plugins/vmgrid/XX_vmgrid.sh
index d9e35dfb..1d0c76be 100644
--- a/os-plugins/plugins/vmgrid/XX_vmgrid.sh
+++ b/os-plugins/plugins/vmgrid/XX_vmgrid.sh
@@ -96,29 +96,9 @@ if [ -f $CONFFILE ]; then
     chmod 1777 ${RWSHARE}
     echo "vmgrid_rwmnt=${RWSHARE#/mnt}" >> ${PLUGINCONFDIR}/vmgrid.conf
 
-    # virtual virtualization plugin
-    testmkd ${VIRTUALIZATIONPLUGIN}
-    totalmemtest=$(expr $(echo ${vmgrid_memratio} \
-                  | awk -F ',' '{print $1" + "$2" + "$3" + "$4" + "$5" + "$6}'))
-    totalmem=$(expr $(grep -i "memtotal" /proc/meminfo \
-               | awk '{print $2}') / 1024)
-    if [ ${totalmemtest} -le 100 2>/dev/null ]; then
-      # get hostmem
-      freememper=$(expr 100 - $(echo ${vmgrid_memratio} \
-                   | awk -F ',' '{print $1" - "$2" - "$3" - "$4}'))
-      freemem=$(expr ${totalmem} \* ${freememper} / 100)
-      echo "virt_freemem=${freemem}" \
-        >> ${VIRTUALIZATIONPLUGIN}/virtualization.conf
-    else
-      # more than 100% memory assigned stupid!
-      # vmgrid will get this as well and exit!
-      # so we have theoretically 100% free
-      echo "virt_freemem=${totalmem}" \
-        >> ${VIRTUALIZATIONPLUGIN}/virtualization.conf
-    fi
-
     # finished ...
     [ $DEBUGLEVEL -gt 0 ] && echo "done with 'vmgrid' os-plugin ..."
   fi
-[ $DEBUGLEVEL -gt 0 ] && echo "  * configuration of 'vmgrid' os-plugin failed"
+else
+  [ $DEBUGLEVEL -gt 0 ] && echo "  * configuration of 'vmgrid' os-plugin failed"
 fi
diff --git a/os-plugins/plugins/vmgrid/files/run-vmgrid.sh b/os-plugins/plugins/vmgrid/files/run-vmgrid.sh
index 626dfcca..bf10dc36 100644
--- a/os-plugins/plugins/vmgrid/files/run-vmgrid.sh
+++ b/os-plugins/plugins/vmgrid/files/run-vmgrid.sh
@@ -27,8 +27,9 @@ RWSHARE=/var/opt/openslx/plugins/vmgrid/share
 # include general configuration from vmgrid
 [ -f ${PLUGINCONFVMGRID}/vmgrid.conf ] && \
   . ${PLUGINCONFVMGRID}/vmgrid.conf
-#[ -f ${PLUGINCONFVMGRID}/vmgrid.include ] && \
-#  . ${PLUGINCONFVMGRID}/vmgrid.include
+# load general virtualization information
+[ -f ${PLUGINCONFROOT}/virtualization/virtualization.conf ] && \
+  . ${PLUGINCONFROOT}/virtualization/virtualization.conf
 # get the vmchooser_active var
 [ -f ${PLUGINCONFROOT}/vmchooser/vmchooser.conf ] && \
   . ${PLUGINCONFROOT}/vmchooser/vmchooser.conf
@@ -64,7 +65,8 @@ while [ $# -gt 0 ]; do
       headless=0
     ;;
     --forcemem)
-      forcemem=$2
+      # get a result which can be divided through 4
+      forcemem=$(expr $2 / 4 \* 4)
       shift
     ;;
     *)
@@ -281,7 +283,8 @@ if [ "${vmgrid_virt}" != "${xmlvirt}" ]; then
 fi
 
 # definition of the client system
-vmostype=$(grep -io '<os param=.*"' ${xmlfile} | awk -F '"' '{ print $2 }')
+vmostype=$(grep -io '<os param=.*"' ${xmlfile} | awk -F '"' '{ print $2 }' \
+           | tr [A-Z] [a-z])
 
 # definition of the networking the client system is connected to
 network_kind=$(grep -io 'network param=.*"' ${xmlfile} \
@@ -305,9 +308,9 @@ writelog "\tVM short name:\t\t$vm_shortname"
 # check for CPU virtualization flags
 #vmgrid::hvm
 
-# get total amount of memory installed in your machine
-totalmem=$(expr $(grep -i "memtotal" /proc/meminfo | awk '{print $2}') / 1024)
+# total amount of memory defined in stage 3
 permem=60
+# get a result which can be divided through 4
 mem=$(expr ${totalmem} / 100 \* ${permem} / 4 \* 4)
 #vmgrid::maxram
 #vmgrid::minram
@@ -350,7 +353,7 @@ writelog "\tVM Hostname:\t\t$hostname"
 # Get all virtual machine specific stuff from the respective include file
 # TODO: rename to run-vuirt.include
 if [ -e ${PLUGINCONFROOT}/${vmgrid_virt}/run-virt.include ] ; then
-  writelog "Strating ${vmgrid_virt} specific part ..."
+  writelog "Starting ${vmgrid_virt} specific part ..."
   self=${vmgrid_virt}
   . ${PLUGINCONFROOT}/${vmgrid_virt}/run-virt.include
 else
diff --git a/os-plugins/plugins/vmgrid/files/vmgrid b/os-plugins/plugins/vmgrid/files/vmgrid
index b75b5341..ef86cb5a 100644
--- a/os-plugins/plugins/vmgrid/files/vmgrid
+++ b/os-plugins/plugins/vmgrid/files/vmgrid
@@ -44,6 +44,9 @@ RWSHARE=/var/opt/openslx/plugins/vmgrid/share
 # include general configuration from vmgrid
 [ -f ${PLUGINCONFDIR}/vmgrid.conf ] && \
   . ${PLUGINCONFDIR}/vmgrid.conf
+# load general virtualization information
+[ -f ${PLUGINCONFROOT}/virtualization/virtualization.conf ] && \
+  . ${PLUGINCONFROOT}/virtualization/virtualization.conf
 # get the vmchooser_active var
 [ -f ${PLUGINCONFROOT}/vmchooser/vmchooser.conf ] && \
   . ${PLUGINCONFROOT}/vmchooser/vmchooser.conf
@@ -77,11 +80,7 @@ echo "Starting to log at $(date)" \
 vmgrid_memratio=$(echo ${vmgrid_memratio} | sed -e "s, *,,g")
 vmgrid_startvms=$(echo ${vmgrid_startvms} | sed -e "s, *,,g")
 
-# get total amount of memory installed in your machine
-# TODO: stage 3? virtaulization plugin
-totalmem=$(expr $(grep -i "memtotal" /proc/meminfo | awk '{print $2}') / 1024)
-
-# get hostmem
+# get hostmem, totalmem from stage 3
 hostratio=$(echo ${vmgrid_memratio} | awk -F ',' '{print $6}')
 hostmem=$(expr ${totalmem} \* ${hostratio} / 100 2>/dev/null)
 if [ ${hostmem} -lt 256 2>/dev/null ]; then
@@ -165,44 +164,3 @@ for i in {1..4}; do
 done
 
 exit 0
-
-################################################################################
-### old stuff with xml files
-################################################################################
-#
-#filter_autostart=$(grep -i "active param" ${vmgrid_xmlpath}/*.xml | \
-#  grep -E "true|1" | awk -F ":" '{print $1}')
-#
-## wozu mehrere starten -> siehe cherkasova
-#
-#filter_virt=
-#for i in ${filter_autostart}; do
-#  filter_temp=
-#  filter_temp=$(cat $i | grep -i "virtualmachine param.*${vmgrid_virt}" | \
-#    wc -l)
-#    if [ ${filter_temp} -eq 1 ]; then
-#      filter_virt="${filter_virt} $i"
-#    fi
-#done
-#
-## remove already started ${vmgrid_startvm}
-#filter_virt=$(echo $filter_virt | \
-#  sed -e "s,${vmgrid_xmlpath}/${vmgrid_startvm%.xml}.xml,,g")
-#
-#sort_virt=$(grep 'priority param' ${vmgrid_xmlpath}/*.xml | sort -n | \
-#  awk -F ":" '{print $1}')
-#
-#for i in ${sort_virt}; do
-#  j=$(echo $filter_virt | grep $i | wc -l)
-#  if [ $j -eq 1 ]; then
-#    filter_virt=$(echo $filter_virt | sed -e "s,$i,,g")
-#    vmgrid ${i#${vmgrid_xmlpath}/}
-#  fi
-#done
-#
-## start vms /wo priority
-#for i in ${filter_virt}; do
-#  vmgrid ${i#${vmgrid_xmlpath}/}
-#done
-#
-#exit 0
diff --git a/os-plugins/plugins/vmgrid/init-hooks/80-after-plugins/virtualization.sh b/os-plugins/plugins/vmgrid/init-hooks/80-after-plugins/virtualization.sh
new file mode 100644
index 00000000..8c241b8b
--- /dev/null
+++ b/os-plugins/plugins/vmgrid/init-hooks/80-after-plugins/virtualization.sh
@@ -0,0 +1,114 @@
+# Copyright (c) 2008..2010 - RZ Uni Freiburg
+# Copyright (c) 2008..2010 - OpenSLX GmbH
+#
+# This program/file is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your feedback to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org
+#
+# script is included from init via the "." load function - thus it has all
+# variables and functions available
+
+# virtual virtualization plugin
+# make sure that this file is the same in vmgrid and vmchooser plugin!
+
+# include default directories
+. /etc/openslx.conf
+
+CONFFILEVMCHOOSER="/initramfs/plugin-conf/vmchooser.conf"
+CONFFILEVMGRID="/initramfs/plugin-conf/vmgrid.conf"
+PLUGINCONFDIR=/mnt/${OPENSLX_DEFAULT_CONFDIR}/plugins/virtualization
+
+# check if plugins available
+active=0
+[ -f ${CONFFILEVMCHOOSER} ] && . ${CONFFILEVMCHOOSER}
+[ -n "${CONFFILEVMCHOOSER}" ] && active=1
+[ -f ${CONFFILEVMGRID} ] && . ${CONFFILEVMGRID}
+[ -n "${CONFFILEVMGRID}" ] && active=1
+
+[ $DEBUGLEVEL -gt 0 ] \
+  && echo "Executing the virtual 'virtualization' plugin ..."
+
+if [ ${active} -ne 0 ] ; then
+
+  # load general configuration
+  . /etc/initramfs-setup
+  # include functions
+  . /etc/functions
+
+  testmkd ${PLUGINCONFDIR}
+
+  # check if vmgrid active and change free mem
+  totalmem=$(expr $(grep -i "memtotal" /proc/meminfo \
+             | awk '{print $2}') / 1024)
+  echo "totalmem=${totalmem}" >> ${PLUGINCONFDIR}/virtualization.conf
+  if [ ${vmgrid_active} -ne 0 ]; then
+    totalmemtest=$(expr $(echo ${vmgrid_memratio} \
+                  | awk -F ',' '{print $1" + "$2" + "$3" + "$4" + "$5" + "$6}'))
+    if [ ${totalmemtest} -le 100 2>/dev/null ]; then
+      # get hostmem
+      freememper=$(expr 100 - $(echo ${vmgrid_memratio} \
+                   | awk -F ',' '{print $1" - "$2" - "$3" - "$4}'))
+      freemem=$(expr ${totalmem} \* ${freememper} / 100)
+      echo "freemem=${freemem}" \
+        >> ${PLUGINCONFDIR}/virtualization.conf
+    else
+      # more than 100% memory assigned stupid!
+      # vmgrid will get this as well and exit!
+      # so we have theoretically 100% free
+      echo "freemem=${totalmem}" \
+        >> ${PLUGINCONFDIR}/virtualization.conf
+    fi
+  else
+    echo "freemem=${totalmem}" \
+      >> ${PLUGINCONFDIR}/virtualization.conf
+fi
+
+  # cpu cores
+  CPU_CORES=$(grep 'processor.*:' /proc/cpuinfo | wc -l)
+  if [ "${CPU_CORES}" -gt "1" 2>/dev/null ]; then
+    echo "cpu_cores=${CPU_CORES}" \
+      >> ${PLUGINCONFDIR}/virtualization.conf
+  else
+    echo 'cpu_cores=1' >> ${PLUGINCONFDIR}/virtualization.conf
+  fi
+
+  # arch
+  echo "host_arch=$(uname -m)" >> ${PLUGINCONFDIR}/virtualization.conf
+
+  # VT enabled cpu?
+  if grep -q ^flags.*\\\<vmx\\\> /proc/cpuinfo; then
+    echo "vtflag=1" >> ${PLUGINCONFDIR}/virtualization.conf
+    echo 'kvm_module="kvm_intel"' >> ${PLUGINCONFDIR}/virtualization.conf
+  elif grep -q ^flags.*\\\<svm\\\> /proc/cpuinfo; then
+    echo "vtflag=1" >> ${PLUGINCONFDIR}/virtualization.conf
+    echo 'kvm_module="kvm_amd"' >> ${PLUGINCONFDIR}/virtualization.conf
+  else
+    echo "vtflag=0" >> ${PLUGINCONFDIR}/virtualization.conf
+  fi
+
+  # get further hw information
+  waitfor /etc/hwinfo.cdrom
+  j=0
+  for i in $(cat /etc/hwinfo.cdrom); do
+    echo "cdrom_$j=$i" >> ${PLUGINCONFDIR}/virtualization.conf
+    j=$(expr $j + 1)
+  done
+
+  waitfor /etc/hwinfo.floppy
+  j=0
+  for i in $(cat /etc/hwinfo.floppy); do
+    echo "floppy_$j=$i" >> ${PLUGINCONFDIR}/virtualization.conf
+    j=$(expr $j + 1)
+  done
+
+  # finished ...
+  [ $DEBUGLEVEL -gt 0 ] \
+    && echo " ok"
+else
+  [ $DEBUGLEVEL -gt 0 ] \
+    && echo " failed"
+fi