summaryrefslogtreecommitdiffstats
path: root/patches/dkms.patch
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-12 19:06:31 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-12 19:06:31 +0000
commitb6a40abe0a9f4127a1def0ac5b5667e963eebd80 (patch)
tree54f460623f385ae9163491649ddccc58131dd703 /patches/dkms.patch
parent05625dbf3ab9345db60dd1a5c9ca76e4f545ac36 (diff)
downloaddraklive-config-b6a40abe0a9f4127a1def0ac5b5667e963eebd80.tar
draklive-config-b6a40abe0a9f4127a1def0ac5b5667e963eebd80.tar.gz
draklive-config-b6a40abe0a9f4127a1def0ac5b5667e963eebd80.tar.bz2
draklive-config-b6a40abe0a9f4127a1def0ac5b5667e963eebd80.tar.xz
draklive-config-b6a40abe0a9f4127a1def0ac5b5667e963eebd80.zip
Temporarily add patches for mga#17223, mga#19517, mga#19520.
Diffstat (limited to 'patches/dkms.patch')
-rw-r--r--patches/dkms.patch19
1 files changed, 19 insertions, 0 deletions
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 $""