summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk2014-04-27 22:28:27 +0200
committerDirk2014-04-27 22:28:27 +0200
commitcd22715eec911f1a27e6621e93545b4593eff872 (patch)
treed021406402e5b1221153fa8d6faa7426ae3241c2
parentCleanup ... (diff)
downloadcore-cd22715eec911f1a27e6621e93545b4593eff872.tar.gz
core-cd22715eec911f1a27e6621e93545b4593eff872.tar.xz
core-cd22715eec911f1a27e6621e93545b4593eff872.zip
More fixes and cleanups ...
-rw-r--r--src/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm4
-rwxr-xr-xsrc/initramfs/scripts/bin/hwautocfg8
-rw-r--r--src/os-plugins/plugins/plymouth/init-hooks/00-started/plymouth.sh22
-rw-r--r--src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm6
4 files changed, 8 insertions, 32 deletions
diff --git a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
index 3166702e..b7e20d2e 100644
--- a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
+++ b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2006..2010 - OpenSLX GmbH
+# Copyright (c) 2006..2014 - OpenSLX GmbH
#
# This program is free software distributed under the GPL version 2.
# See http://openslx.org/COPYING
@@ -232,7 +232,7 @@ sub _copyKernelModules
# (some of these modules do not exist on all distros, so they will be
# filtered out again by the respective distro object):
my @kernelModules = qw(
- af_packet unix hid hid-generic hid-bright usbhid uhci-hcd ohci-hcd vesafb fbcon netconsole
+ af_packet unix hid hid-generic hid-bright usbhid uhci-hcd ohci-hcd netconsole
);
push @kernelModules, @{ $self->{'suggested-kernel-modules'} };
diff --git a/src/initramfs/scripts/bin/hwautocfg b/src/initramfs/scripts/bin/hwautocfg
index bf8937b6..f015f6fc 100755
--- a/src/initramfs/scripts/bin/hwautocfg
+++ b/src/initramfs/scripts/bin/hwautocfg
@@ -27,8 +27,9 @@ done
# no kernel messages, switch on hotplug via /sbin/mdev
echo "0 0 0 0" >/proc/sys/kernel/printk
echo "/sbin/mdev" >/proc/sys/kernel/hotplug
-echo -e "card[0-9] 0:0 660 =dri/\n(control[A-Z])([0-9]+) 0:0 660 =dri/\n\
-event[0-9] 0:0 640 =input/\n" >>/etc/mdev.conf
+echo -e "(control[A-Z])([0-9]) 0:0 660 =snd/\n(pcm[A-Z][0-9][A-Z][0-9][cp]) 0:0 660 =snd/\n\
+(hw[A-Z0-9]*) 0:0 660 =snd/\ncard[0-9] 0:0 660 =dri/\nevent[0-9] 0:0 640 =input/\n\
+(control[A-Z])([0-9]+) 0:0 660 =dri/\n" >>/etc/mdev.conf
modprobe -a ${MODPRV} usbhid hid-bright hid-generic 2>/dev/null &
# check from vga= that the traditional framebuffer is needed e.g. for splashy
# get information on the graphics adaptor if bootsplash or xserver plugins are
@@ -229,6 +230,9 @@ mdev -s
# mount filesystem parts (if any) requested in disk setup
[ -f /etc/do_mnt ] && \
{ sed -e "1i. /etc/functions" -i /etc/do_mnt; sh /etc/do_mnt; } &
+# assign proper permissions
+chown root:audio /dev/snd/*
+chown root:video /dev/dri/*
# remove unneeded disk and mouse drivers
[ ! -s /etc/hwinfo.disk ] && rmmod sd_mod 2>/dev/null
#grep -q " PS/2 " /etc/hwinfo.mouse || \
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";