diff options
| author | Dirk von Suchodoletz | 2009-02-25 06:07:07 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-02-25 06:07:07 +0100 |
| commit | dcda3cdb7dcfc2190253fdc87dd34e10ec22b384 (patch) | |
| tree | d138ba257e3e82e3caa78337b9d6445812266cd8 /os-plugins/plugins/virtualbox | |
| parent | Cleaned up/restructured the mounting of fs components (function (diff) | |
| download | core-dcda3cdb7dcfc2190253fdc87dd34e10ec22b384.tar.gz core-dcda3cdb7dcfc2190253fdc87dd34e10ec22b384.tar.xz core-dcda3cdb7dcfc2190253fdc87dd34e10ec22b384.zip | |
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
Diffstat (limited to 'os-plugins/plugins/virtualbox')
| -rw-r--r-- | os-plugins/plugins/virtualbox/XX_virtualbox.sh | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/os-plugins/plugins/virtualbox/XX_virtualbox.sh b/os-plugins/plugins/virtualbox/XX_virtualbox.sh index 6f717f29..40d60c7b 100644 --- a/os-plugins/plugins/virtualbox/XX_virtualbox.sh +++ b/os-plugins/plugins/virtualbox/XX_virtualbox.sh @@ -34,30 +34,12 @@ if [ -e /initramfs/plugin-conf/virtualbox.conf ]; then fi if [ -n "${vbimgserv}" ] ; then # directory where qemu images are expected in - testmkd /mnt/var/lib/virt/virtualbox - case "${vbimgprot}" in - *nbd) - # TODO: to be filled in ... - ;; - lbdev) - # we expect the stuff on toplevel directory, filesystem type should be - # autodetected here ... (vbimgserv is blockdev here) - vbbdev=/dev/${vbimgserv} - waitfor ${vbbdev} 20000 - echo -e "ext2\nreiserfs\nvfat\nxfs" >/etc/filesystems - mount -o ro ${vbbdev} /mnt/var/lib/virt/virtualbox || \ - 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 ${vbimgserv}:${vbimgpath} \ - /mnt/var/lib/virt/virtualbox && break - done - ;; - esac + mnttarget=/mnt/var/lib/virt/virtualbox + # mount the virtualbox image source readonly (ro) + fsmount ${vbimgprot} ${vbimgserv} ${vbimgpath} ${mnttarget} ro + else + [ $DEBUGLEVEL -gt 1 ] && error " * Incomplete information in variable \ +${virtualbox_imagesrc}." nonfatal fi # copy version depending files - the vmchooser expects for every virtua- # lization plugin a file named after it (here run-virtualbox.include) |