From 62d1a60d5b4a76b8106b99f9fb76ea5329d5e57d Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 16 Mar 2011 08:50:36 +0000 Subject: rename modprobe.d files newer version of upstreram modprobe requires them to have .conf suffix --- Makefile | 2 +- aliases | 57 ---------------------------------------------- aliases.conf | 57 ++++++++++++++++++++++++++++++++++++++++++++++ blacklist | 71 ---------------------------------------------------------- blacklist.conf | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ i386 | 4 ---- i386.conf | 4 ++++ 7 files changed, 133 insertions(+), 133 deletions(-) delete mode 100644 aliases create mode 100644 aliases.conf delete mode 100644 blacklist create mode 100644 blacklist.conf delete mode 100644 i386 create mode 100644 i386.conf diff --git a/Makefile b/Makefile index 1579b3b..279365d 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ ETC_FILES = TZ \ CONFD_FILES = $(addprefix conf.d/, tuntap vlan) UDHCPC_FILES =default.script -MODPROBED_FILES =aliases blacklist i386 +MODPROBED_FILES =aliases.conf blacklist.conf i386.conf CRONTABS =crontab DISTFILES =$(ETC_FILES) $(UDHCPC_FILES) $(MODPROBED_FILES) Makefile diff --git a/aliases b/aliases deleted file mode 100644 index 9b1796f..0000000 --- a/aliases +++ /dev/null @@ -1,57 +0,0 @@ -# Aliases to tell insmod/modprobe which modules to use - -# Uncomment the network protocols you don't want loaded: -# alias net-pf-1 off # Unix -# alias net-pf-2 off # IPv4 -# alias net-pf-3 off # Amateur Radio AX.25 -# alias net-pf-4 off # IPX -# alias net-pf-5 off # DDP / appletalk -# alias net-pf-6 off # Amateur Radio NET/ROM -# alias net-pf-9 off # X.25 -# alias net-pf-10 off # IPv6 -# alias net-pf-11 off # ROSE / Amateur Radio X.25 PLP -# alias net-pf-19 off # Acorn Econet - -alias char-major-10-175 agpgart -alias char-major-10-200 tun -alias char-major-81 bttv -alias char-major-108 ppp_generic -alias /dev/ppp ppp_generic -alias tty-ldisc-3 ppp_async -alias tty-ldisc-14 ppp_synctty -alias ppp-compress-21 bsd_comp -alias ppp-compress-24 ppp_deflate -alias ppp-compress-26 ppp_deflate - -# Crypto modules (see http://www.kerneli.org/) -alias loop-xfer-gen-0 loop_gen -alias loop-xfer-3 loop_fish2 -alias loop-xfer-gen-10 loop_gen -alias cipher-2 des -alias cipher-3 fish2 -alias cipher-4 blowfish -alias cipher-6 idea -alias cipher-7 serp6f -alias cipher-8 mars6 -alias cipher-11 rc62 -alias cipher-15 dfc2 -alias cipher-16 rijndael -alias cipher-17 rc5 - -# Support for i2c and lm_sensors -alias char-major-89 i2c-dev - -# xfrm -alias xfrm-type-2-4 xfrm4_tunnel -alias xfrm-type-2-50 esp4 -alias xfrm-type-2-51 ah4 -alias xfrm-type-2-108 ipcomp -alias xfrm-type-10-41 xfrm6_tunnel -alias xfrm-type-10-50 esp6 -alias xfrm-type-10-51 ah6 -alias xfrm-type-10-108 ipcomp6 - -alias sha1 sha1-generic -# change to aes-i586 to boost performance -alias aes aes-generic - diff --git a/aliases.conf b/aliases.conf new file mode 100644 index 0000000..9b1796f --- /dev/null +++ b/aliases.conf @@ -0,0 +1,57 @@ +# Aliases to tell insmod/modprobe which modules to use + +# Uncomment the network protocols you don't want loaded: +# alias net-pf-1 off # Unix +# alias net-pf-2 off # IPv4 +# alias net-pf-3 off # Amateur Radio AX.25 +# alias net-pf-4 off # IPX +# alias net-pf-5 off # DDP / appletalk +# alias net-pf-6 off # Amateur Radio NET/ROM +# alias net-pf-9 off # X.25 +# alias net-pf-10 off # IPv6 +# alias net-pf-11 off # ROSE / Amateur Radio X.25 PLP +# alias net-pf-19 off # Acorn Econet + +alias char-major-10-175 agpgart +alias char-major-10-200 tun +alias char-major-81 bttv +alias char-major-108 ppp_generic +alias /dev/ppp ppp_generic +alias tty-ldisc-3 ppp_async +alias tty-ldisc-14 ppp_synctty +alias ppp-compress-21 bsd_comp +alias ppp-compress-24 ppp_deflate +alias ppp-compress-26 ppp_deflate + +# Crypto modules (see http://www.kerneli.org/) +alias loop-xfer-gen-0 loop_gen +alias loop-xfer-3 loop_fish2 +alias loop-xfer-gen-10 loop_gen +alias cipher-2 des +alias cipher-3 fish2 +alias cipher-4 blowfish +alias cipher-6 idea +alias cipher-7 serp6f +alias cipher-8 mars6 +alias cipher-11 rc62 +alias cipher-15 dfc2 +alias cipher-16 rijndael +alias cipher-17 rc5 + +# Support for i2c and lm_sensors +alias char-major-89 i2c-dev + +# xfrm +alias xfrm-type-2-4 xfrm4_tunnel +alias xfrm-type-2-50 esp4 +alias xfrm-type-2-51 ah4 +alias xfrm-type-2-108 ipcomp +alias xfrm-type-10-41 xfrm6_tunnel +alias xfrm-type-10-50 esp6 +alias xfrm-type-10-51 ah6 +alias xfrm-type-10-108 ipcomp6 + +alias sha1 sha1-generic +# change to aes-i586 to boost performance +alias aes aes-generic + diff --git a/blacklist b/blacklist deleted file mode 100644 index 167fc31..0000000 --- a/blacklist +++ /dev/null @@ -1,71 +0,0 @@ -# -# Listing a module here prevents the hotplug scripts from loading it. -# Usually that'd be so that some other driver will bind it instead, -# no matter which driver happens to get probed first. Sometimes user -# mode tools can also control driver binding. - -# tulip ... de4x5, xircom_tulip_cb, dmfe (...) handle same devices -blacklist de4x5 - -# At least 2.4.3 and later xircom_tulip doesn't have that conflict -# xircom_tulip_cb -blacklist dmfe - -#evbug is a debug tool and should be loaded explicitly -blacklist evbug - -# Alternate 8139 driver. Some 8139 cards need this specific driver, -# though... -# blacklist 8139cp - -# Ethernet over IEEE1394 module. In too many cases this will load -# when there's no eth1394 device present (just an IEEE1394 port) -blacklist eth1394 - -# This module causes many Intel motherboards to crash and reboot. -blacklist i8xx-tco - -# The kernel lists this as "experimental", but for now it's "broken" -blacklist via-ircc - -# ALSA modules to support sound modems. These should be loaded manually -# if needed. For most people they just break sound support... -blacklist snd-atiixp-modem -blacklist snd-intel8x0m -blacklist snd-via82xx-modem - -# Alternative module to Orinoco Wireless Cards. -blacklist hostap -blacklist hostap_cs - -# framebuffer drivers -blacklist aty128fb -blacklist atyfb -blacklist radeonfb -blacklist i810fb -blacklist cirrusfb -blacklist intelfb -blacklist kyrofb -blacklist i2c-matroxfb -blacklist hgafb -blacklist nvidiafb -blacklist rivafb -blacklist savagefb -blacklist sstfb -blacklist neofb -blacklist tridentfb -blacklist tdfxfb -blacklist virgefb -blacklist vga16fb -blacklist matroxfb_base - -# blacklist 1394 drivers -blacklist ohci1394 -blacklist video1394 -blacklist dv1394 - -# blacklist mISDN dirver by default as we prefer dahdi drivers -blacklist hfcmulti -blacklist hfcpci -blacklist hfcsusb - diff --git a/blacklist.conf b/blacklist.conf new file mode 100644 index 0000000..167fc31 --- /dev/null +++ b/blacklist.conf @@ -0,0 +1,71 @@ +# +# Listing a module here prevents the hotplug scripts from loading it. +# Usually that'd be so that some other driver will bind it instead, +# no matter which driver happens to get probed first. Sometimes user +# mode tools can also control driver binding. + +# tulip ... de4x5, xircom_tulip_cb, dmfe (...) handle same devices +blacklist de4x5 + +# At least 2.4.3 and later xircom_tulip doesn't have that conflict +# xircom_tulip_cb +blacklist dmfe + +#evbug is a debug tool and should be loaded explicitly +blacklist evbug + +# Alternate 8139 driver. Some 8139 cards need this specific driver, +# though... +# blacklist 8139cp + +# Ethernet over IEEE1394 module. In too many cases this will load +# when there's no eth1394 device present (just an IEEE1394 port) +blacklist eth1394 + +# This module causes many Intel motherboards to crash and reboot. +blacklist i8xx-tco + +# The kernel lists this as "experimental", but for now it's "broken" +blacklist via-ircc + +# ALSA modules to support sound modems. These should be loaded manually +# if needed. For most people they just break sound support... +blacklist snd-atiixp-modem +blacklist snd-intel8x0m +blacklist snd-via82xx-modem + +# Alternative module to Orinoco Wireless Cards. +blacklist hostap +blacklist hostap_cs + +# framebuffer drivers +blacklist aty128fb +blacklist atyfb +blacklist radeonfb +blacklist i810fb +blacklist cirrusfb +blacklist intelfb +blacklist kyrofb +blacklist i2c-matroxfb +blacklist hgafb +blacklist nvidiafb +blacklist rivafb +blacklist savagefb +blacklist sstfb +blacklist neofb +blacklist tridentfb +blacklist tdfxfb +blacklist virgefb +blacklist vga16fb +blacklist matroxfb_base + +# blacklist 1394 drivers +blacklist ohci1394 +blacklist video1394 +blacklist dv1394 + +# blacklist mISDN dirver by default as we prefer dahdi drivers +blacklist hfcmulti +blacklist hfcpci +blacklist hfcsusb + diff --git a/i386 b/i386 deleted file mode 100644 index b89459f..0000000 --- a/i386 +++ /dev/null @@ -1,4 +0,0 @@ -alias parport_lowlevel parport_pc -alias char-major-10-144 nvram -alias binfmt-0064 binfmt_aout -alias char-major-10-135 rtc diff --git a/i386.conf b/i386.conf new file mode 100644 index 0000000..b89459f --- /dev/null +++ b/i386.conf @@ -0,0 +1,4 @@ +alias parport_lowlevel parport_pc +alias char-major-10-144 nvram +alias binfmt-0064 binfmt_aout +alias char-major-10-135 rtc -- cgit v1.2.3