summaryrefslogtreecommitdiffstats
path: root/os-plugins
diff options
context:
space:
mode:
authorVolker Uhrig2009-01-21 15:10:36 +0100
committerVolker Uhrig2009-01-21 15:10:36 +0100
commite28d7d4a67d8d454f86093b67c576158406788f3 (patch)
treef89ff5ae275a0eb681f6ce51a6570e64504d6a72 /os-plugins
parent * dkms+fglrx on ubuntu 8.10 (diff)
downloadcore-e28d7d4a67d8d454f86093b67c576158406788f3.tar.gz
core-e28d7d4a67d8d454f86093b67c576158406788f3.tar.xz
core-e28d7d4a67d8d454f86093b67c576158406788f3.zip
moved /var/lib/vmware => /var/lib/virt/vmware
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2512 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
-rw-r--r--os-plugins/plugins/vmware/XX_vmware.sh6
-rw-r--r--os-plugins/plugins/vmware/files/runvmware-player-v14
-rw-r--r--os-plugins/plugins/vmware/files/runvmware-player-v24
3 files changed, 7 insertions, 7 deletions
diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh
index 9a2bf398..d83c6203 100644
--- a/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/os-plugins/plugins/vmware/XX_vmware.sh
@@ -156,7 +156,7 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \
vmimgpath="$(uri_token ${vmware_imagesrc} path)"
fi
if [ -n "${vmimgserv}" ] ; then
- testmkd /mnt/var/lib/vmware
+ testmkd /mnt/var/lib/virt/vmware
case "${vmimgprot}" in
*nbd)
# TODO: to be filled in ...
@@ -167,7 +167,7 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \
vmbdev=/dev/${vmimgserv}
waitfor ${vmbdev} 20000
echo -e "ext2\nreiserfs\nvfat\nxfs" >/etc/filesystems
- mount -o ro ${vmbdev} /mnt/var/lib/vmware || \
+ mount -o ro ${vmbdev} /mnt/var/lib/virt/vmware || \
error "$scfg_evmlm" nonfatal
;;
*)
@@ -176,7 +176,7 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \
[ $proto = "fail" ] && { error "$scfg_nfs" nonfatal;
noimg=yes; break;}
mount -n -t nfs -o ro,nolock,$proto ${vmimgserv}:${vmimgpath} \
- /mnt/var/lib/vmware && break
+ /mnt/var/lib/virt/vmware && break
done
;;
esac
diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v1 b/os-plugins/plugins/vmware/files/runvmware-player-v1
index 3ee02d62..9e967e16 100644
--- a/os-plugins/plugins/vmware/files/runvmware-player-v1
+++ b/os-plugins/plugins/vmware/files/runvmware-player-v1
@@ -124,7 +124,7 @@ hver=4
hostname="VM-${HOST}"
# Folder of VirtualMachine Images
-vmdir="/var/lib/vmware"
+vmdir="/var/lib/virt/vmware"
# special Variables, persistence vmware?
#TODO: do we really need it? Should be everywhere nonpersistent
@@ -171,7 +171,7 @@ diskfile="${vmdir}/${imagename}"
# command line variables
# start with this this default commmand line options + extra
-# TODO: defaults laut datei --include /var/lib/vmware/tmpl/winconfig
+# TODO: defaults laut datei --include /var/lib/virt/vmware/tmpl/winconfig
# --include <includefile> include code right before program start
# Should we debug? Hell yes, we should always debug!
diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v2 b/os-plugins/plugins/vmware/files/runvmware-player-v2
index 0b3ddcf9..263a2f59 100644
--- a/os-plugins/plugins/vmware/files/runvmware-player-v2
+++ b/os-plugins/plugins/vmware/files/runvmware-player-v2
@@ -124,7 +124,7 @@ hver=4
hostname="VM-${HOST}"
# Folder of VirtualMachine Images
-vmdir="/var/lib/vmware"
+vmdir="/var/lib/virt/vmware"
# special Variables, persistence vmware?
#TODO: do we really need it? Should be everywhere nonpersistent
@@ -171,7 +171,7 @@ diskfile="${vmdir}/${imagename}"
# command line variables
# start with this this default commmand line options + extra
-# TODO: defaults laut datei --include /var/lib/vmware/tmpl/winconfig
+# TODO: defaults laut datei --include /var/lib/virt/vmware/tmpl/winconfig
# --include <includefile> include code right before program start
# Should we debug? Hell yes, we should always debug!