diff options
| author | Dirk von Suchodoletz | 2010-03-06 02:28:40 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2010-03-06 02:28:40 +0100 |
| commit | e5a270b5efc59644a686c1942805227f689f7793 (patch) | |
| tree | 52e8a23ec60c09abfa35680a1b6b0c7c7d07a6ef | |
| parent | Reflect this in VERSIONS ... (diff) | |
| download | core-e5a270b5efc59644a686c1942805227f689f7793.tar.gz core-e5a270b5efc59644a686c1942805227f689f7793.tar.xz core-e5a270b5efc59644a686c1942805227f689f7793.zip | |
Improvement and fixes ...
| -rw-r--r-- | os-plugins/plugins/qemukvm/XX_qemukvm.sh | 4 | ||||
| -rw-r--r-- | os-plugins/plugins/qemukvm/files/qemu-ifup | 5 | ||||
| -rw-r--r-- | os-plugins/plugins/vmchooser/files/run-virt.sh | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/os-plugins/plugins/qemukvm/XX_qemukvm.sh b/os-plugins/plugins/qemukvm/XX_qemukvm.sh index 6ecec75b..b7dd308c 100644 --- a/os-plugins/plugins/qemukvm/XX_qemukvm.sh +++ b/os-plugins/plugins/qemukvm/XX_qemukvm.sh @@ -62,7 +62,7 @@ ${qemukvm_imagesrc}." nonfatal fi # copy version depending files - the vmchooser expects for every virtua- # lization plugin a file named after it (here run-qemukvm.include) - testmkd /mnt/etc/opt/openslx + testmkd /mnt/etc/opt/openslx/plugin-repo/qemukvm cp /mnt/opt/openslx/plugin-repo/qemukvm/run-virt.include \ /mnt/etc/opt/openslx/plugins/qemukvm/run-qemukvm.include # create a network configuration template (variables should be setable in @@ -70,7 +70,7 @@ ${qemukvm_imagesrc}." nonfatal natnetwork="192.168.101" honetwork="192.168.102" echo -e "nataddress=${natnetwork}.254/24\nhoaddress=${honetwork}.254/24" \ - >/mnt/etc/opt/openslx/network.qemukvm + >/mnt/etc/opt/openslx/plugins/qemukvm/network.qemukvm # copy the runlevel script (proper place for all distros??) cp /mnt/opt/openslx/plugin-repo/qemukvm/qemukvm /mnt/etc/init.d diff --git a/os-plugins/plugins/qemukvm/files/qemu-ifup b/os-plugins/plugins/qemukvm/files/qemu-ifup index 59bcad85..6a25ad29 100644 --- a/os-plugins/plugins/qemukvm/files/qemu-ifup +++ b/os-plugins/plugins/qemukvm/files/qemu-ifup @@ -16,7 +16,7 @@ # Use the udhcpcd as DHCP server and brctl as provided by default in OpenSLX # environments via uclibc-wrapper. -. /etc/opt/openslx/network.qemukvm +. /etc/opt/openslx/plugin-repo/qemukvm/network.qemukvm # Just decide by the virtual network device used which kind of connection # should be set up (passed in $1): tap0 = bridge, tap1 = nat, tap2 = hostonly. @@ -32,7 +32,8 @@ case "$1" in sed -e "s,NWIF,tap1,;s,/misc/,/qemu/," \ -e "s,CNETWORK,${nataddress%.*},;s,PIDFILE,/tmp/qemu-$USER/udhcpd.pid," \ -e "s,LEASEFILE,/tmp/qemu-$USER/udhcpd.leases," \ - /etc/opt/openslx/udhcpd.conf >/tmp/qemu-$USER/udhcpd.conf + /etc/opt/openslx/plugin-repo/qemukvm/udhcpd.conf \ + >/tmp/qemu-$USER/udhcpd.conf touch /tmp/qemu-$USER/udhcpd.leases # ip link set tap1 up # ip addr add 192.168.101.254/24 dev tap1 diff --git a/os-plugins/plugins/vmchooser/files/run-virt.sh b/os-plugins/plugins/vmchooser/files/run-virt.sh index 5aefc47e..5733ee41 100644 --- a/os-plugins/plugins/vmchooser/files/run-virt.sh +++ b/os-plugins/plugins/vmchooser/files/run-virt.sh @@ -107,7 +107,9 @@ parallel=$(grep -io '<parport param=.*"' ${xml} | awk -F '"' '{ print $2 }') # cpu cores cpu_cores="${cpu_cores}" -# Get total amount of memory installed in your machine +# check for CPU virtualization flags + +# get total amount of memory installed in your machine totalmem=$(expr $(grep -i "memtotal" /proc/meminfo | awk '{print $2}') / 1024) permem=60 mem=$(expr ${totalmem} / 100 \* ${permem} / 4 \* 4) |