diff options
author | Eric Hameleers <alien@slackware.com> | 2016-03-09 13:37:08 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2016-03-09 13:37:08 +0100 |
commit | 324cb336b0a90a13c6a51b3d30d90f5e5be8fa32 (patch) | |
tree | 314a1402badde1414b93afe7599ea4f20327bce1 /liveinit | |
parent | 2630c502aaedb0d1d1a42fafc23d25332fd4de65 (diff) | |
download | liveslak-324cb336b0a90a13c6a51b3d30d90f5e5be8fa32.tar.gz liveslak-324cb336b0a90a13c6a51b3d30d90f5e5be8fa32.tar.xz |
Add the missing part of the "disable glamor 2d acceleration" patch.
New boot option 'nga' (which stands for 'no glamor acceleration')
adds a configuration file to X.Org. This disables the (now default) glamor
acceleration which causes a X startup failure with the error:
"EGL_MESA_drm_image required; (EE) modeset(0): glamor initialization failed".
Diffstat (limited to 'liveinit')
-rwxr-xr-x | liveinit | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -41,6 +41,7 @@ MARKER="@MARKER@" PERSISTENCE="@PERSISTENCE@" LIVEMEDIA="" +LIVEPATH="" # By default, let the media determine if we can write persistent changes: # However, if we define TORAM=1, we will also set VIRGIN=1 since we want @@ -59,8 +60,8 @@ LOCALHD=0 # Perhaps we need to blacklist some kernel module(s): BLACKLIST="" -# QEMU X.Org needs glamor acceleration disabled, -# otherwise don't mess with the defaults: +# QEMU X.Org and some other setups need glamor 2D acceleration disabled, +# default in X.Org is to enable it: GLAMORACCEL=1 INITRD=$(cat /initrd-name) @@ -127,6 +128,9 @@ for ARG in $(cat /proc/cmdline); do # Format: luksvol=file1[:/mountpoint1][,file1[:/mountpoint2],...] LUKSVOL=$(echo $ARG | cut -f2 -d=) ;; + nga) + GLAMORACCEL=0 + ;; noload=*) NOLOAD=$(echo $ARG | cut -f2 -d=) ;; |