From b6a40abe0a9f4127a1def0ac5b5667e963eebd80 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 12 Nov 2016 19:06:31 +0000
Subject: Temporarily add patches for mga#17223, mga#19517, mga#19520.

---
 patches/dkms.patch | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 patches/dkms.patch

(limited to 'patches/dkms.patch')

diff --git a/patches/dkms.patch b/patches/dkms.patch
new file mode 100644
index 0000000..0263516
--- /dev/null
+++ b/patches/dkms.patch
@@ -0,0 +1,19 @@
+--- sbin/dkms.orig	2016-09-24 00:49:50.300155014 +0100
++++ sbin/dkms		2016-09-24 00:51:15.442929416 +0100
+@@ -1294,10 +1294,12 @@
+     fi
+ 
+     # Load installed modules
+-    current_arch=`uname -m`
+-    [[ $current_arch = i?86 ]] && current_arch=i586
+-    if [ "${kernelver_array[0]}" == "$(uname -r)" -a "${arch_array[0]}" == "$current_arch" ]; then
+-        /usr/sbin/dkms_autoload ${dest_module_name[@]}
++    if [ -e /etc/X11/xorg.conf -o ! -e /run/mgalive ]; then
++        current_arch=`uname -m`
++        [[ $current_arch = i?86 ]] && current_arch=i586
++        if [ "${kernelver_array[0]}" == "$(uname -r)" -a "${arch_array[0]}" == "$current_arch" ]; then
++            /usr/sbin/dkms_autoload ${dest_module_name[@]}
++        fi
+     fi
+ 
+     echo $""
-- 
cgit v1.2.1