Mailinglist Archive: opensuse-commit (918 mails)
| < Previous | Next > |
commit module-init-tools
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 23 Feb 2007 12:54:15 +0100
- Message-id: <20070223115416.10179678185@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package module-init-tools
checked in at Fri Feb 23 12:54:15 CET 2007.
--------
--- module-init-tools/module-init-tools.changes 2007-02-02 11:48:42.000000000 +0100
+++ /mounts/work_src_done/STABLE/module-init-tools/module-init-tools.changes 2007-02-22 14:43:53.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Feb 22 14:22:49 CET 2007 - mmarek@xxxxxxx
+
+- removed some obsolete options and aliases from modprobe.conf
+ [#239194]
+- load ide-scsi with idescsi_nocd=1 [#192430, #242009]
+
+-------------------------------------------------------------------
New:
----
removed-in-10.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ module-init-tools.spec ++++++
--- /var/tmp/diff_new_pack.ez3340/_old 2007-02-23 12:52:21.000000000 +0100
+++ /var/tmp/diff_new_pack.ez3340/_new 2007-02-23 12:52:21.000000000 +0100
@@ -12,7 +12,7 @@
Name: module-init-tools
Version: 3.2.2
-Release: 72
+Release: 75
%define ver 3.2.2
License: GNU General Public License (GPL)
Group: System/Kernel
@@ -29,6 +29,7 @@
Source3: README.SUSE
Source4: weak-modules
Source10: modprobe.conf.tar.gz
+Source11: removed-in-10.3
Patch0: %{name}-%{ver}-prototypes.diff
Patch1: %{name}-%{ver}-config_filter.diff
Patch2: %{name}-%{ver}-alsa-fix.diff
@@ -96,7 +97,7 @@
rm $RPM_BUILD_ROOT/sbin/insmod.static
install -m755 generate-modprobe.conf $RPM_BUILD_ROOT/sbin
install -m755 %SOURCE2 $RPM_BUILD_ROOT/sbin
-install -m644 %SOURCE3 .
+install -m644 %SOURCE3 %SOURCE11 .
ln -sf /bin/lsmod $RPM_BUILD_ROOT/sbin/lsmod
#
# now assemble the parts for modprobe.conf
@@ -121,14 +122,18 @@
%config /etc/modprobe.conf
%config(noreplace) /etc/modprobe.conf.local
%doc AUTHORS COPYING ChangeLog FAQ NEWS README TODO
-%doc README.SUSE
+%doc README.SUSE removed-in-10.3
%doc %{_mandir}/man?/*
/bin/*
/sbin/*
/usr/lib/%name
/etc/modprobe.d
-%changelog -n module-init-tools
+%changelog
+* Thu Feb 22 2007 - mmarek@xxxxxxx
+- removed some obsolete options and aliases from modprobe.conf
+ [#239194]
+- load ide-scsi with idescsi_nocd=1 [#192430, #242009]
* Fri Feb 02 2007 - mmarek@xxxxxxx
- drop also insmod.static
* Fri Feb 02 2007 - mmarek@xxxxxxx
++++++ modprobe.conf.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/modprobe.conf/modprobe.conf.common new/modprobe.conf/modprobe.conf.common
--- old/modprobe.conf/modprobe.conf.common 2006-03-08 16:02:21.000000000 +0100
+++ new/modprobe.conf/modprobe.conf.common 2007-02-22 14:41:09.000000000 +0100
@@ -61,16 +61,13 @@
########################################################################
# options cdu31a cdu31a_port=0x340 cdu31a_irq=0
-# options sbpcd sbpcd=0x230,1
# options aztcd aztcd=0x320
# options cm206 cm206=0x340,11
# options gscd gscd=0x340
-# options mcd mcd=0x300,11
# options mcdx mcdx=0x300,11
# options optcd optcd=0x340
# options sjcd sjcd_base=0x340
# options sonycd535 sonycd535=0x340
-# options isp16 isp16_cdrom_base=0x340 isp16_cdrom_irq=0 isp16_cdrom_dma=0 isp16_cdrom_type=Sanyo
# options ne io=0x300 irq=5
@@ -85,17 +82,14 @@
# options 3c507 io=0x300 irq=10
# options 3c509 irq=10
# options at1700 io=0x260 irq=10
-# options smc-ultra io=0x200 irq=10
# options wd io=0x300 irq=10
# options smc9194 io=0x200 irq=10 ifport=0
# options e2100 io=0x300 irq=10 mem=0xd0000 xcvr=0
# options depca io=0x200 irq=7
# options ewrk3 io=0x300 irq=10
# options eexpress io=0x300 irq=10
-# options hp-plus io=0x300 irq=10
# options hp io=0x300 irq=10
# options hp100 hp100_port=0x380
-# options apricot io=0x300 irq=10
# options ac3200 io=0x300 irq=10 mem=0xd0000
# options de620 io=0x378 irq=7 bnc=1
# options ibmtr io=0xa20
@@ -103,7 +97,6 @@
# options plip io=0x378 irq=7
# options eepro io=0x260 irq=10 mem=0x6000
# options eth16i io=0x2a0 irq=10
-# options fmv18x io=0x220 irq=10
# options ni52 io=0x360 irq=9 memstart=0xd0000 memend=0xd4000
# options bttv pll=1 radio=0 card=0
# options tuner type=0
@@ -118,24 +111,10 @@
remove dummy1 /sbin/modprobe -r -o dummy1 --ignore-remove dummy
########################################################################
-# cipe section
-########################################################################
-
-alias cipcb0 cipcb
-alias cipcb1 cipcb
-
-options cipcb cipe_debug=0
-
-########################################################################
# block dev aliases
########################################################################
-alias block-major-1 rd
-alias block-major-2 floppy
install block-major-3 /bin/true
-alias block-major-7 loop
-alias block-major-8 sd_mod
-alias block-major-11 sr_mod
alias block-major-13 xd
alias block-major-15 cdu31a
alias block-major-16 gscd
@@ -143,12 +122,7 @@
alias block-major-18 sjcd
alias block-major-20 mcdx
install block-major-22 /bin/true
-alias block-major-23 mcd
alias block-major-24 sonycd535
-alias block-major-25 sbpcd
-alias block-major-26 sbpcd
-alias block-major-27 sbpcd
-alias block-major-28 sbpcd
alias block-major-29 aztcd
alias block-major-32 cm206
install block-major-33 /bin/true
@@ -158,15 +132,11 @@
alias block-major-45 pd
alias block-major-46 pcd
alias block-major-47 pf
-alias block-major-117 evms
########################################################################
# char dev aliases
########################################################################
-alias char-major-6 lp
-alias char-major-9 st
-alias char-major-10-130 softdog
install char-major-10-134 /bin/true
install char-major-10-135 /bin/true
alias char-major-10-175 agpgart
@@ -176,18 +146,13 @@
install char-major-15 /bin/true
alias char-major-19 cyclades
alias char-major-20 cyclades
-alias char-major-21 sg
-alias char-major-27 ftape
install char-major-29 /bin/true
-alias char-major-36 netlink_dev
# alias char-major-43 hisax
# alias char-major-44 hisax
# alias char-major-45 hisax
install char-major-43 /bin/true
install char-major-44 /bin/true
install char-major-45 /bin/true
-alias char-major-48 riscom8
-alias char-major-49 riscom8
alias char-major-67 coda
alias char-major-75 specialix
alias char-major-76 specialix
@@ -197,14 +162,9 @@
install char-major-81-2 /bin/true
install char-major-81-3 /bin/true
-alias char-major-83 vtx
-options vtx quiet=1
-
alias char-major-89 i2c-dev
alias char-major-96 pt
alias char-major-97 pg
-alias char-major-107 3dfx
-alias char-major-109 lvm-mod
# remove this if sound is configured
install char-major-116 /bin/true
@@ -214,9 +174,7 @@
# the kernel 2.4 uses pppoe
########################################################################
-alias char-major-108 ppp_generic
alias char-major-144 pppoe
-alias net-pf-24 pppoe
########################################################################
# IrDA
@@ -265,13 +223,8 @@
#alias char-major-180 usbcore
-alias InterMezzo intermezzo
-alias char-major-185 intermezzo
-
alias char-major-188 usbserial
-alias char-major-195* nvidia
-alias char-major-206 osst
alias char-major-212 /bin/true
alias binfmt-204 binfmt_aout
@@ -282,16 +235,10 @@
alias binfmt-0008 binfmt_aout
alias iso9660 isofs
-alias tty-ldisc-1 slip
-alias tty-ldisc-2 serio
-alias tty-ldisc-5 mkiss
# alias tty-ldisc-7 6pack
install tty-ldisc-7 /bin/true
-# IrDA
-alias tty-ldisc-11 irtty-sir
-
# alias ax0 mkiss
install ax0 /bin/true
# alias sp0 6pack
@@ -308,7 +255,6 @@
alias ppp0 ppp_generic
alias ppp1 ppp_generic
-alias tty-ldisc-3 ppp_async
alias plip0 plip
alias plip1 plip
@@ -318,56 +264,6 @@
alias gre0 ip_gre
alias ipip0 ipip
-alias ppp-compress-18 ppp_mppe
-alias ppp-compress-21 bsd_comp
-alias ppp-compress-24 ppp_deflate
-alias ppp-compress-26 ppp_deflate
-
-alias net-pf-1 unix
-alias net-pf-3 ax25
-# install net-pf-3 /bin/true
-alias net-pf-4 ipx
-# install net-pf-4 /bin/true
-alias net-pf-5 appletalk
-# install net-pf-5 /bin/true
-alias net-pf-6 netrom
-# install net-pf-6 /bin/true
-alias net-pf-10 ipv6
-# install net-pf-10 /bin/true
-alias net-pf-11 rose
-# install net-pf-11 /bin/true
-alias net-pf-15 af_key
-alias net-pf-17 af_packet
-alias net-pf-31 bluetooth
-
-alias bt-proto-0 l2cap
-alias bt-proto-2 sco
-alias bt-proto-3 rfcomm
-alias bt-proto-4 bnep
-
-alias md-personality-1 linear
-alias md-personality-2 raid0
-alias md-personality-3 raid1
-alias md-personality-4 raid5
-alias md-personality-7 multipath
-
-alias tap0 ethertap
-alias tap1 ethertap
-alias tap2 ethertap
-alias tap3 ethertap
-alias tap4 ethertap
-alias tap5 ethertap
-alias tap6 ethertap
-alias tap7 ethertap
-alias tap8 ethertap
-alias tap9 ethertap
-alias tap10 ethertap
-alias tap11 ethertap
-alias tap12 ethertap
-alias tap13 ethertap
-alias tap14 ethertap
-alias tap15 ethertap
-
alias xfrm-type-2-50 esp4
alias xfrm-type-2-51 ah4
alias xfrm-type-2-108 ipcomp
@@ -375,21 +271,18 @@
alias xfrm-type-10-51 ah6
alias xfrm-type-10-108 ipcomp6
-# don't try to reset isa-pnp cards on startup
-options isa-pnp isapnp_reset=0
-
# Linux-ABI
install binfmt_misc /sbin/modprobe --ignore-install binfmt_misc && { mount -t binfmt_misc none /proc/sys/fs/binfmt_misc; }
remove binfmt_misc { umount /proc/sys/fs/binfmt_misc; } ; /sbin/modprobe -r --ignore-remove binfmt_misc
-# Bluetooth
-alias bt-proto-5 cmtp
-alias bt-proto-6 hidp
-
# NFS
alias nfs4 nfs
# rpc_pipefs
install rpc_pipefs /sbin/modprobe sunrpc
+# we don't want ide-scsi handle CD drives [#242009]
+options ide-scsi idescsi_nocd=1
+
+
# end of common part for modprobe.conf
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/modprobe.conf/modprobe.conf.i386 new/modprobe.conf/modprobe.conf.i386
--- old/modprobe.conf/modprobe.conf.i386 2006-03-23 14:20:51.000000000 +0100
+++ new/modprobe.conf/modprobe.conf.i386 2007-02-22 14:00:55.000000000 +0100
@@ -1,8 +1,5 @@
# begin of i386 part for modprobe.conf
-alias char-major-4 serial
-alias char-major-5 serial
-
alias parport_lowlevel parport_pc
# options parport_pc io=0x378 irq=none,none
# If you have multiple parallel ports, specify them this way:
@@ -12,30 +9,11 @@
alias char-major-10-219 mwave
# options mwave dspirq=10 dspio=0x130 uartirq=3 uartio=0x2f8
-# nVidia nforce chipset (network + audio)
-#alias eth0 nvnet
-#alias sound-slot-1 nvaudio
-#alias usb-interface usb-ohci
-
# IBM thinkpad tpctl
# see /usr/share/doc/packages/tpctl/
alias char-major-10-170 thinkpad
# options thinkpad enable_smapi=0
-# Linux-ABI
-alias char-major-30 abi-ibcs
-alias binfmt-0004 binfmt_coff
-alias binfmt-332 abi-ibcs
-alias binfmt-518 abi-ibcs
-alias binfmt-002c abi-ibcs
-alias personality-1 abi-ibcs
-alias personality-2 abi-ibcs
-alias personality-3 abi-sco
-alias personality-4 abi-wyse
-alias personality-5 abi-ibcs
-alias personality-7 abi-ibcs
-alias personality-13 abi-solaris
-alias personality-14 abi-uw7
# required for DRI support on SiS chips
options sisfb mode=none mem=12288
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/modprobe.conf/modprobe.conf.ia64 new/modprobe.conf/modprobe.conf.ia64
--- old/modprobe.conf/modprobe.conf.ia64 2003-11-17 12:03:03.000000000 +0100
+++ new/modprobe.conf/modprobe.conf.ia64 2007-02-12 11:22:37.000000000 +0100
@@ -1,8 +1,5 @@
# begin of ia64 part for modprobe.conf
-alias char-major-4 serial
-alias char-major-5 serial
-
alias parport_lowlevel parport_pc
# options parport_pc io=0x378 irq=none,none
# If you have multiple parallel ports, specify them this way:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/modprobe.conf/modprobe.conf.ppc new/modprobe.conf/modprobe.conf.ppc
--- old/modprobe.conf/modprobe.conf.ppc 2003-08-29 17:09:31.000000000 +0200
+++ new/modprobe.conf/modprobe.conf.ppc 2007-02-12 11:41:19.000000000 +0100
@@ -30,13 +30,6 @@
# If you have multiple parallel ports, specify them this way:
# options parport_pc io=0x378,0x278 irq=none,none
-# alias char-major-14 pmacsound
-# alias sound pmacsound
-# alias midi pmacsound
-# alias sound-slot-0 pmacsound
-# alias sound-service-0-0 pmacsound
-# alias sound-service-0-3 pmacsound
-
# firewire modules, spb2 is for FW drives and CD
install ohci1394 { modprobe ieee1394; } ; /sbin/modprobe --ignore-install ohci1394
install sbp2 { modprobe ohci1394; } ; /sbin/modprobe --ignore-install sbp2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/modprobe.conf/modprobe.conf.x86_64 new/modprobe.conf/modprobe.conf.x86_64
--- old/modprobe.conf/modprobe.conf.x86_64 2006-03-23 14:20:44.000000000 +0100
+++ new/modprobe.conf/modprobe.conf.x86_64 2007-02-12 11:26:55.000000000 +0100
@@ -1,8 +1,5 @@
# begin of x86_64 part for modprobe.conf
-alias char-major-4 serial
-alias char-major-5 serial
-
alias parport_lowlevel parport_pc
# options parport_pc io=0x378 irq=none,none
# If you have multiple parallel ports, specify them this way:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |