summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk von Suchodoletz2009-02-19 00:50:58 +0100
committerDirk von Suchodoletz2009-02-19 00:50:58 +0100
commit20229c2c94a0a3e5b774d59925c6406aa3709c1a (patch)
treec93d54ed87f333945dfd185c6449c013980a4da8
parentMore fixes for run-virt.sh environment ... (diff)
downloadcore-20229c2c94a0a3e5b774d59925c6406aa3709c1a.tar.gz
core-20229c2c94a0a3e5b774d59925c6406aa3709c1a.tar.xz
core-20229c2c94a0a3e5b774d59925c6406aa3709c1a.zip
Path fixes ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2612 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--os-plugins/plugins/qemukvm/XX_qemukvm.sh2
-rw-r--r--os-plugins/plugins/virtualbox/XX_virtualbox.sh2
-rw-r--r--os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm2
3 files changed, 4 insertions, 2 deletions
diff --git a/os-plugins/plugins/qemukvm/XX_qemukvm.sh b/os-plugins/plugins/qemukvm/XX_qemukvm.sh
index 669b4142..98311d72 100644
--- a/os-plugins/plugins/qemukvm/XX_qemukvm.sh
+++ b/os-plugins/plugins/qemukvm/XX_qemukvm.sh
@@ -62,7 +62,7 @@ if [ -e /initramfs/plugin-conf/qemukvm.conf ]; then
# 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
- cp /mnt/opt/openslx/plugin-repo/run-qemukvm/run-virt.include \
+ cp /mnt/opt/openslx/plugin-repo/qemukvm/run-virt.include \
/mnt/etc/opt/openslx/run-qemukvm.include
fi
diff --git a/os-plugins/plugins/virtualbox/XX_virtualbox.sh b/os-plugins/plugins/virtualbox/XX_virtualbox.sh
index ab1a9c96..76c5a9dc 100644
--- a/os-plugins/plugins/virtualbox/XX_virtualbox.sh
+++ b/os-plugins/plugins/virtualbox/XX_virtualbox.sh
@@ -62,7 +62,7 @@ if [ -e /initramfs/plugin-conf/virtualbox.conf ]; then
# copy version depending files - the vmchooser expects for every virtua-
# lization plugin a file named after it (here run-virtualbox.include)
testmkd /mnt/etc/opt/openslx
- cp /mnt/opt/openslx/plugin-repo/run-virtualbox/run-virt.include \
+ cp /mnt/opt/openslx/plugin-repo/virtualbox/run-virt.include \
/mnt/etc/opt/openslx/run-virtualbox.include
fi
diff --git a/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm b/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
index 81ee6dce..86a79e05 100644
--- a/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
+++ b/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
@@ -78,6 +78,8 @@ sub getAttrInfo
description => unshiftHereDoc(<<' End-of-Here'),
location of XML configuration for virtual images
End-of-Here
+ #TODO:
+ #content_regex => qr{^(0|1)$},
content_descr => 'path to xml files',
default => '/var/lib/virt',
},