diff options
| author | Dirk von Suchodoletz | 2008-08-05 21:53:04 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2008-08-05 21:53:04 +0200 |
| commit | 826bbfe8022ab03d143aadb7d2568097a0ba3f3c (patch) | |
| tree | af79ae80b2e8c86823e83d9b0f9931571f8ac543 /os-plugins/plugins/vmware | |
| parent | Finalizing the renaming of r1949. (diff) | |
| download | core-826bbfe8022ab03d143aadb7d2568097a0ba3f3c.tar.gz core-826bbfe8022ab03d143aadb7d2568097a0ba3f3c.tar.xz core-826bbfe8022ab03d143aadb7d2568097a0ba3f3c.zip | |
Stuff needed for plugins to run properly in stage3 ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1963 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/vmware')
| -rw-r--r-- | os-plugins/plugins/vmware/XX_vmware.sh | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh index a10808d6..a6c1aeb3 100644 --- a/os-plugins/plugins/vmware/XX_vmware.sh +++ b/os-plugins/plugins/vmware/XX_vmware.sh @@ -11,6 +11,8 @@ # # General information about OpenSLX can be found at http://openslx.org # +. /etc/functions +. /etc/distro-functions # TODO: nvram,functions # write /etc/vmware/config (if a non-standard location of vmware basedir is @@ -164,11 +166,9 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \ # autodetected here ... (vmimgserv is blockdev here) vmbdev=/dev/${vmimgserv} waitfor ${vmbdev} 20000 - echo "ext2" > /etc/filesystems - echo "reiserfs" >> /etc/filesystems - echo "vfat" >> /etc/filesystems - echo "xfs" >> /etc/filesystems - mount -o ro ${vmbdev} /mnt/var/lib/vmware || error "$scfg_evmlm" nonfatal + echo -e "ext2\nreiserfs\nvfat\nxfs" >/etc/filesystems + mount -o ro ${vmbdev} /mnt/var/lib/vmware || \ + error "$scfg_evmlm" nonfatal ;; *) # we expect nfs mounts here ... @@ -251,14 +251,12 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \ fi # write version information for image problem (v2 images don't run - # on v1 players + # on v1 players) if [ "${vmware_kind}" = "vmpl1.0" ]; then echo "vmplversion=1" > /mnt/etc/vmware/version - fi - if [ "${vmware_kind}" = "vmpl2.0" ]; then + elif [ "${vmware_kind}" = "vmpl2.0" ]; then echo "vmplversion=2" > /mnt/etc/vmware/version - fi - if [ "${vmware_kind}" = "local" ]; then + elif [ "${vmware_kind}" = "local" ]; then version=$(strings /usr/lib/vmware/bin/vmplayer|head -n 1|cut -c 1) echo "vmplversion=${version}" > /mnt/etc/vmware/version fi |