From cd22715eec911f1a27e6621e93545b4593eff872 Mon Sep 17 00:00:00 2001 From: Dirk Date: Sun, 27 Apr 2014 22:28:27 +0200 Subject: More fixes and cleanups ... --- .../plymouth/init-hooks/00-started/plymouth.sh | 22 ---------------------- .../plugins/vmware/OpenSLX/OSPlugin/vmware.pm | 6 ------ 2 files changed, 28 deletions(-) delete mode 100644 src/os-plugins/plugins/plymouth/init-hooks/00-started/plymouth.sh (limited to 'src/os-plugins') diff --git a/src/os-plugins/plugins/plymouth/init-hooks/00-started/plymouth.sh b/src/os-plugins/plugins/plymouth/init-hooks/00-started/plymouth.sh deleted file mode 100644 index ab8c9346..00000000 --- a/src/os-plugins/plugins/plymouth/init-hooks/00-started/plymouth.sh +++ /dev/null @@ -1,22 +0,0 @@ - ( hwinfo --gfxcard >/etc/hwinfo.gfxcard - case $(cat /etc/hwinfo.gfxcard) in - *i915*) - modprobe -a ${MODPRV} i915 2>/dev/null - ;; - *intel*|*Intel*) - modprobe -a ${MODPRV} i810 i830 i915 2>/dev/null - ;; - *nvidia*|*NVidia*|*nouveau*) - modprobe ${MODPRV} nouveau 2>/dev/null - ;; - *radeon*|*Radeon*) - modprobe ${MODPRV} radeon 2>/dev/null - ;; - *mga*|*matrox*|*Matrox*) - modprobe ${MODPRV} mga 2>/dev/null - ;; - *) - modprobe -a ${MODPRV} r128 savage sis tdfx ttm via - ;; - esac - modprobe -a drm fbcon; mdev -s ) & diff --git a/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm index 8f7f791a..d37d5668 100644 --- a/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm +++ b/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm @@ -608,12 +608,6 @@ sub _localInstallation $vmbuildversion = $versionhash{vmbuildversion}; # set version information - # VMplayer 2.0 - if ($vmversion eq "2.0" || $vmversion eq "6.0") { - $kind="local20"; - # VMplayer 2.5 - } elsif ($vmversion eq "2.5" || $vmversion eq "6.5") { - $kind="local25"; # VMplayer 3.0, 3.1, 4.X, 5.X, 6.X Workstation 7.0, 7.1, 8.X, 9.X, 10.X } elsif ($vmversion eq "3.0" || $vmversion eq "7.0" || $vmversion eq "3.1" || $vmversion eq "7.1") { $kind="local3X"; -- cgit v1.2.3-55-g7522