diff options
| author | Volker Uhrig | 2008-08-22 15:02:39 +0200 |
|---|---|---|
| committer | Volker Uhrig | 2008-08-22 15:02:39 +0200 |
| commit | 706014cdc0372307d5a78ec568224d077d5669fa (patch) | |
| tree | 48273519ff0dc493b6b675ed7395b1128fc93032 /os-plugins | |
| parent | * changed way to find kernel behaviour (diff) | |
| download | core-706014cdc0372307d5a78ec568224d077d5669fa.tar.gz core-706014cdc0372307d5a78ec568224d077d5669fa.tar.xz core-706014cdc0372307d5a78ec568224d077d5669fa.zip | |
* should get ride about ticket 262
* use insmod
* identify version for local installation
(not used yet. should be used by other
plugins/external tools, to check if the
configured vmplayer is able to handle
v2 vmware images)
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2081 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm | 6 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm | 4 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm | 6 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm | 6 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/XX_vmware.sh | 2 |
5 files changed, 19 insertions, 5 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm index 9e82a2df..fa6ed3d1 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm @@ -72,7 +72,11 @@ sub fillRunlevelScript if ($kind eq 'local') { $script .= unshiftHereDoc(<<" End-of-Here"); # to be filled in via the stage1 configuration script - modprobe -qa vmmon vmnet vmblock 2>/dev/null || return 1 + # if we don't have vmmon and vmnet it should print out + # an error. vmblock depends on version + insmod /lib/modules/\$(uname -r)/misc/vmmon.ko || return 1 + insmod /lib/modules/\$(uname -r)/misc/vmnet.ko || return 1 + insmod /lib/modules/\$(uname -r)/misc/vmblock.ko 2>/dev/null || return 0 # most probably nobody wants to run the parallel port driver ... #modprobe vm... End-of-Here diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm index 02c93501..d47569a4 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm @@ -59,7 +59,9 @@ sub fillRunlevelScript if ($kind eq 'local') { $script .= unshiftHereDoc(<<" End-of-Here"); # to be filled in via the stage1 configuration script - modprobe -qa vmmon vmnet vmblock 2>/dev/null || return 1 + insmod /lib/modules/\$(uname -r)/misc/vmmon.ko || return 1 + insmod /lib/modules/\$(uname -r)/misc/vmnet.ko || return 1 + insmod /lib/modules/\$(uname -r)/misc/vmblock.ko 2>/dev/null || return 0 # most probably nobody wants to run the parallel port driver ... #modprobe vm... End-of-Here diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm index a3f31840..0071f65e 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm @@ -54,7 +54,11 @@ sub fillRunlevelScript if ($kind eq 'local') { $script .= unshiftHereDoc(<<" End-of-Here"); # to be filled in via the stage1 configuration script - modprobe -qa vmmon vmnet vmblock 2>/dev/null || return 1 + # if we don't have vmmon and vmnet it should print out + # an error. vmblock depends on version + insmod /lib/modules/\$(uname -r)/misc/vmmon.ko || return 1 + insmod /lib/modules/\$(uname -r)/misc/vmnet.ko || return 1 + insmod /lib/modules/\$(uname -r)/misc/vmblock.ko 2>/dev/null || return 0 # most probably nobody wants to run the parallel port driver ... #modprobe vm... End-of-Here diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm index 66fa03a8..f266c443 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm @@ -60,7 +60,11 @@ sub fillRunlevelScript if ($kind eq 'local') { $script .= unshiftHereDoc(<<" End-of-Here"); # to be filled in via the stage1 configuration script - modprobe -qa vmmon vmnet vmblock 2>/dev/null || return 1 + # if we don't have vmmon and vmnet it should print out + # an error. vmblock depends on version + insmod /lib/modules/\$(uname -r)/misc/vmmon.ko || return 1 + insmod /lib/modules/\$(uname -r)/misc/vmnet.ko || return 1 + insmod /lib/modules/\$(uname -r)/misc/vmblock.ko 2>/dev/null || return 0 # most probably nobody wants to run the parallel port driver ... #modprobe vm... End-of-Here diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh index b3f388fe..8ea19842 100644 --- a/os-plugins/plugins/vmware/XX_vmware.sh +++ b/os-plugins/plugins/vmware/XX_vmware.sh @@ -256,7 +256,7 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \ elif [ "${vmware_kind}" = "vmpl2.0" ]; then echo "vmplversion=2" > /mnt/etc/vmware/version elif [ "${vmware_kind}" = "local" ]; then - version=$(strings /mnt/usr/lib/vmware/bin/vmplayer|head -n 1|cut -c 1) + version=$(strings /mnt/usr/lib/vmware/bin/vmplayer|grep -e "^[12]\..*build-[0-9]*"|head -n 1|cut -c 1) echo "vmplversion=${version}" > /mnt/etc/vmware/version fi |