Simplified handling of mounting the image sources via newly

introduced function fsmount, see r2639.


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

1 files changed, 7 insertions, 24 deletions

diff --git a/os-plugins/plugins/qemukvm/XX_qemukvm.sh b/os-plugins/plugins/qemukvm/XX_qemukvm.sh
index 2d96d212..62a26037 100644
--- a/os-plugins/plugins/qemukvm/XX_qemukvm.sh
+++ b/os-plugins/plugins/qemukvm/XX_qemukvm.sh
@@ -52,30 +52,13 @@ qemu(-kvm)\n  makes not much sense."
     fi
     if [ -n "${qkimgserv}" ] ; then
       # directory where qemu images are expected in
-      testmkd /mnt/var/lib/virt/qemukvm
-      case "${qkimgprot}" in
-        *nbd)
-          # TODO: to be filled in ...
-          ;;
-        lbdev)
-          # we expect the stuff on toplevel directory, filesystem type should
-          # be autodetected here ... (qkimgserv is blockdev here)
-          qkbdev=/dev/${qkimgserv}
-          waitfor ${qkbdev} 20000
-          echo -e "ext2\nreiserfs\nvfat\nxfs" >/etc/filesystems
-          mount -o ro ${qkbdev} /mnt/var/lib/virt/qemukvm || \
-            error "$scfg_evmlm" nonfatal
-          ;;
-        *)
-          # we expect nfs mounts here ...
-          for proto in tcp udp fail; do
-            [ $proto = "fail" ] && { error "$scfg_nfs" nonfatal;
-            noimg=yes; break;}
-          mount -n -t nfs -o ro,nolock,$proto ${qkimgserv}:${qkimgpath} \
-            /mnt/var/lib/virt/qemukvm && break
-          done
-          ;;
-      esac
+      mnttarget=/mnt/var/lib/virt/qemukvm
+      # mount the qemukvm image source readonly (ro)
+      fsmount ${qkimgprot} ${qkimgserv} ${qkimgpath} ${mnttarget} ro
+    else
+      [ $DEBUGLEVEL -gt 1 ] && error "  * Incomplete information in variable \
+${qemukvm_imagesrc}." nonfatal
+    fi
     fi
     # copy version depending files - the vmchooser expects for every virtua-
     # lization plugin a file named after it (here run-qemukvm.include)