From 49b6291a4080c80d2783529bad260732a90879c0 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Thu, 13 Mar 2014 22:16:48 +0400 Subject: [PATCH] kernel, stage1: don't provide r8168.ko by default It conflicts with r8169.ko inobviously. The whole mess looks like this: - r8169.ko doesn't work for all of Realtek 8111/8168/8169 mutations - r8168.ko works with some of the chips r8169.ko doesn't - r8168.ko also works with many chips r8169.ko works with - r8169.ko is provided by kernel-image package (thus default) - r8168.ko is provided by kernel-modules-r8168 package (optional) - kernel-modules-r8168 package requires r8168-blacklist package - r8168-blacklist package is a one-liner that blacklists r8169.ko - STAGE1_KMODULES wouldn't include r8168 (std-def) or rtl8168 (led-ws) - sub.in/stage1/modules would mention r8168.ko (m-p-d: r8169.ko) So a LiveCD built with use/kernel/net might work with RTL8111/8110 just fine when booted live but fail to automatically load the module when installed onto hard drive; manual modprobe r8169 would work though. NB: some of the chips (those available to me) would work just fine both ways -- this has contributed to fixing this *that* late. Bottom line: do not install backup/kludge drivers overriding main ones by default! Thanks sem@ for providing the crucial hint. --- features.in/kernel/config.mk | 4 +++- sub.in/stage1/modules | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/features.in/kernel/config.mk b/features.in/kernel/config.mk index deb40cfb..55006540 100644 --- a/features.in/kernel/config.mk +++ b/features.in/kernel/config.mk @@ -9,5 +9,7 @@ use/kernel: @$(call add_feature) @$(call set,KFLAVOURS,std-def) +# r8168 is a kludge, never install it by default use/kernel/net: - @$(call add,THE_KMODULES,e1000e igb r8168 rtl8168) + @$(call add,THE_KMODULES,e1000e igb) + @$(call add,MAIN_KMODULES,r8168 rtl8168) diff --git a/sub.in/stage1/modules b/sub.in/stage1/modules index b1e37b78..08a40947 100644 --- a/sub.in/stage1/modules +++ b/sub.in/stage1/modules @@ -174,7 +174,7 @@ qlogicfas408.ko qlogicfas.ko qlogicfc.ko qlogicisp.ko -r8168.ko +r8169.ko raid_class.ko reiserfs.ko rrunner.ko