summaryrefslogtreecommitdiffstats
path: root/initrd/initrd-stuff/bin/hwautocfg
diff options
context:
space:
mode:
Diffstat (limited to 'initrd/initrd-stuff/bin/hwautocfg')
-rwxr-xr-xinitrd/initrd-stuff/bin/hwautocfg9
1 files changed, 4 insertions, 5 deletions
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 526e59b6..bc9ffd11 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -181,9 +181,8 @@ for section in Files ServerFlags Module InputDevice Monitor \
sed -e "s,XMODULE,${XMODULE}," -e "s%XDESC%${XDESC}%" >>$xfc
# special options may be needed for some drivers
[ $DEBUGLEVEL -gt 1 ] && msg "X setup" \
-"adding for some Xfree86 modules \
-(radeon, s3virge, nvidia) special options to\nthe 'Device' section. Consult \
-hwsetup if you like to add more or remove some."
+"adding for some Xfree86 modules (radeon, s3virge, nvidia) special\noptions \
+to the 'Device' section. Consult hwsetup if you like to add more or\nremove some."
[ x$DRV = "xs3virge" ] && {
echo -e "\tOption\t\t\"XVideo\" \"Off\"\n" >>$xfc
[ $DEBUGLEVEL -gt 1 ] && msg "X setup" \
@@ -279,10 +278,10 @@ modprobe ${MODPRV} usbcore &
# "drivers" (pseudo, placeholder strings, ...) to exclude from loading
# depending on distro more hw modules have to be excluded too. use the
# D_HWMODTOIGNORE for that purpose
-DRIVERLIST=" disabled unknown ignore pcspkr synaptics keybdev\
+DRIVERLIST=" disabled unknown ignore pcspkr synaptics keybdev kanotix\
${D_HWMODTOIGNORE} "
# driver blacklist (real modules which fail to load)
-DRIVERLIST=${DRIVERLIST}"hw_random kanotix genericwheelusb "
+DRIVERLIST=${DRIVERLIST}"hw_random genericwheelusb "
# hack for pseudo modules (not to load)
for i in $DRIVERLIST ; do
echo -e "alias\t$i\tusbcore" >> /etc/modprobe.conf