diff options
| author | Simon Rettberg | 2014-04-01 15:34:00 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-04-01 15:34:00 +0200 |
| commit | 2ffaf2a433925455ab16e5664b7103b94f3dee24 (patch) | |
| tree | 3703a7b1996314a88ac0d847a7beb1bceaca05e3 /remote/rootfs/rootfs-stage31/data | |
| parent | sdfoighsdihoi (diff) | |
| download | tm-scripts-2ffaf2a433925455ab16e5664b7103b94f3dee24.tar.gz tm-scripts-2ffaf2a433925455ab16e5664b7103b94f3dee24.tar.xz tm-scripts-2ffaf2a433925455ab16e5664b7103b94f3dee24.zip | |
[stage31] Support for KCL-switches nvidia and amd, which unconditionally load proprietary gfx drivers for testing
Diffstat (limited to 'remote/rootfs/rootfs-stage31/data')
| -rw-r--r-- | remote/rootfs/rootfs-stage31/data/inc/drm.functions | 11 | ||||
| -rwxr-xr-x | remote/rootfs/rootfs-stage31/data/init | 12 |
2 files changed, 18 insertions, 5 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/inc/drm.functions b/remote/rootfs/rootfs-stage31/data/inc/drm.functions index 20083724..c3b7b419 100644 --- a/remote/rootfs/rootfs-stage31/data/inc/drm.functions +++ b/remote/rootfs/rootfs-stage31/data/inc/drm.functions @@ -36,7 +36,16 @@ load_gfx () { setup_gfx () { local KERN RETVAL CARD CARDS SUCCESS FILES DRM - # check which driver to load + # check if forced by KCL + if [ "x$GFX" == "xnvidia" ]; then + load_gfx @nvidia + return + fi + if [ "x$GFX" == "xamd" ]; then + load_gfx @amd + return + fi + # not forced - check which driver to load CARDS=$(lspci | grep 'Class 0300' | awk '{print $4}') if [ -e "/drm.cfg" ] && [ -n "$CARDS" ]; then SUCCESS="yes" diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index b3681eee..b91818fa 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -33,7 +33,7 @@ mkdir -p "$FUTURE_ROOT/opt/openslx" # let kernel know that mdev is to be used for hotplug echo "/sbin/mdev" > /proc/sys/kernel/hotplug -# read kernel command line for debugging switch +# read kernel command line DEBUG=0 SPLASH=0 read KCL < "/proc/cmdline" @@ -51,8 +51,12 @@ for opts in ${KCL}; do ;; BOOTIF=*) MAC="$( echo "$opts" | cut -b 11- | tr '-' ':' | tr '[A-Z]' '[a-z]' )" ;; # make mac lowercase for udev (see setup_network) - splash*) - [ -e "/etc/splash.ppm" ] && SPLASH=1 + splash) + [ -e "/etc/splash.ppm" ] && SPLASH=1 ;; + nvidia) + GFX=nvidia ;; + ati|amd) + GFX=amd ;; esac done @@ -119,7 +123,7 @@ done echo "Switching root...." echo "$bench_result" > "${FUTURE_ROOT}/opt/openslx/.benchmark" # Prepare environment (HOME is needed as a hack for nss_ldap with ssl and no caching) -unset BOOT_IMAGE initrd KCL ip slxbase slxsrv IPINFO vga ip MAC BOOTIF DEBUG OLDPWD MUTED_OUTPUT +unset BOOT_IMAGE initrd KCL ip slxbase slxsrv IPINFO vga ip MAC BOOTIF DEBUG OLDPWD MUTED_OUTPUT GFX export HOME=/ export init="/usr/lib/systemd/systemd" export recovery= |