diff options
| -rw-r--r-- | config/live.cfg | 3 | ||||
| -rw-r--r-- | patches/dkms.patch | 19 |
2 files changed, 0 insertions, 22 deletions
diff --git a/config/live.cfg b/config/live.cfg index 836b0d2..dff647b 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -125,9 +125,6 @@ my $_l = { # [ "files/pkgs.pm", "/usr/lib/libDrakX/install/pkgs.pm" ], ], patches => [ - # Temporary patches waiting to be applied to mga packages - # mga#19520 - 'patches/dkms.patch', ], erase_rpms => [ ], diff --git a/patches/dkms.patch b/patches/dkms.patch deleted file mode 100644 index 0263516..0000000 --- a/patches/dkms.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 $"" |