summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-01-10 14:03:37 +0100
committer Eric Hameleers <alien@slackware.com>2016-01-10 14:03:37 +0100
commit6ed9f699acbe1278753d6d7267db903c4b452a35 (patch)
tree68dd7725b1d0d6a317fbfcd53ad9490458487f0f
parent710dea0bae3979d084021c910af3f53388e72603 (diff)
downloadliveslak-6ed9f699acbe1278753d6d7267db903c4b452a35.tar.gz
liveslak-6ed9f699acbe1278753d6d7267db903c4b452a35.tar.xz
Fixes for SDDM and X keyboard mapping.
-rwxr-xr-xmake_slackware_live.sh18
1 files changed, 18 insertions, 0 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index c8018dc..bcf8011 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -1091,6 +1091,21 @@ KRES_EOF
alreadyMigrated=true
KWALLET_EOL
+ # Make sure that Plasma and SDDM work on older GPUs,
+ # by forcing Qt5 to use software GL rendering:
+ cat <<"EOGL" >> ${LIVE_ROOTDIR}/usr/share/sddm/scripts/Xsetup
+
+OPENGL_VERSION=$(LANG=C glxinfo |grep '^OpenGL version string: ' |head -n 1 |sed -e 's/^OpenGL version string: \([0-9]\).*$/\1/g')
+if [ "$OPENGL_VERSION" -lt 2 ]; then
+ QT_XCB_FORCE_SOFTWARE_OPENGL=1
+ export QT_XCB_FORCE_SOFTWARE_OPENGL
+fi
+
+EOGL
+
+ # Workaround a bug where SDDM does not always use the configured keymap:
+ echo "setxkbmap" >> ${LIVE_ROOTDIR}/usr/share/sddm/scripts/Xsetup
+
fi # End LIVEDE = PLASMA5
# Give the live user a copy of our skeleton configuration:
@@ -1098,6 +1113,9 @@ cd ${LIVE_ROOTDIR}/etc/skel/
find . -exec cp -a --parents "{}" ${LIVE_ROOTDIR}/home/live/ \;
cd - 1>/dev/null
+# Workaround a bug where our Xkbconfig is not loaded sometimes:
+echo "setxkbmap" > ${LIVE_ROOTDIR}/home/live/.xprofile
+
# Make sure that user 'live' owns her own files:
chroot ${LIVE_ROOTDIR} chown -R live:users home/live