diff options
| -rw-r--r-- | os-plugins/plugins/virtualbox/XX_virtualbox.sh | 2 | ||||
| -rw-r--r-- | os-plugins/plugins/virtualbox/files/run-virt.include | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/os-plugins/plugins/virtualbox/XX_virtualbox.sh b/os-plugins/plugins/virtualbox/XX_virtualbox.sh index 76c5a9dc..6f717f29 100644 --- a/os-plugins/plugins/virtualbox/XX_virtualbox.sh +++ b/os-plugins/plugins/virtualbox/XX_virtualbox.sh @@ -41,7 +41,7 @@ if [ -e /initramfs/plugin-conf/virtualbox.conf ]; then ;; lbdev) # we expect the stuff on toplevel directory, filesystem type should be - # autodetected here ... (vmimgserv is blockdev here) + # autodetected here ... (vbimgserv is blockdev here) vbbdev=/dev/${vbimgserv} waitfor ${vbbdev} 20000 echo -e "ext2\nreiserfs\nvfat\nxfs" >/etc/filesystems diff --git a/os-plugins/plugins/virtualbox/files/run-virt.include b/os-plugins/plugins/virtualbox/files/run-virt.include index 541acd61..a266fdd7 100644 --- a/os-plugins/plugins/virtualbox/files/run-virt.include +++ b/os-plugins/plugins/virtualbox/files/run-virt.include @@ -16,14 +16,14 @@ permem=66 -mem=expr(${totalmem} * ${permem}) +mem=$(expr{totalmem} * ${permem}) # virtual fd/cd/dvd and drive devices, floppy b: for configuration #floppya is always false, if we have a floppy device or not isn't #important. floppya="FALSE" floppyb="TRUE" -floppybname="/etc/vmware/loopimg/fd.img" +floppybname="/var/lib/virt/vmchooser/loopimg/fd.img" cdr_1="FALSE" cdr_2="FALSE" # ide is expected default, test for the virtual disk image type should @@ -32,12 +32,6 @@ ide="TRUE" hddrv="ide" -# folder of virtual machine images -vmdir="/var/lib/virt/virtualbox" - -# image file -diskfile="${vmdir}/${imagename}" - -# set the variables appropriately -VIRTCMD=$(which vbox???) +# set the variables appropriately (several interfaces with different names) +VIRTCMD=$(which virtualbox 2>/dev/null) |