Hello community,
here is the log from the commit of package module-init-tools for openSUSE:Factory
checked in at Wed Mar 18 01:22:37 CET 2009.
--------
--- module-init-tools/module-init-tools.changes 2009-03-02 12:45:20.000000000 +0100
+++ module-init-tools/module-init-tools.changes 2009-03-17 17:50:59.000000000 +0100
@@ -1,0 +2,32 @@
+Tue Mar 17 17:50:20 CET 2009 - mmarek@suse.cz
+
+- updated to 3.7-pre9
+ * code cleanup & minor fixes
+- link zlib dynamically
+
+-------------------------------------------------------------------
+Tue Mar 10 13:49:59 CET 2009 - mmarek@suse.cz
+
+- modprobe.conf.tar.gz: removed unneeded/duplicate aliases and
+ aliases to non-existing modules. In case something breaks,
+ aliases should be added back with a reference to a bugreport
+ explaining why the alias is needed and why it can't be added to
+ the module itself.
+
+-------------------------------------------------------------------
+Tue Mar 10 11:53:38 CET 2009 - mmarek@suse.cz
+
+- depmod-00-system.conf: do not generate modules.*map files by
+ default
+
+-------------------------------------------------------------------
+Mon Mar 9 16:17:41 CET 2009 - mmarek@suse.cz
+
+- updated to 3.7-pre7
+ * modprobe now uses /etc/modprobe.d/*.conf as it's sole source of
+ configuration (files without .conf are still read, but cause a
+ warning). The local configuration file has been renamed to
+ /etc/modprobe.d/99-local.conf. Packages should install their
+ configuration files as /etc/modprobe.d/50-<name>.conf
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
depmod.conf
module-init-tools-3.7-pre1.tar.bz2
module-init-tools-manpages-3.7-pre1.tar.gz
revert-search-all-config-files.patch
unsupported-modules
New:
----
10-unsupported-modules.conf
depmod-00-system.conf
docbook2man.patch
enable-zlib-dynamic.patch
module-init-tools-3.7-pre9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ module-init-tools.spec ++++++
--- /var/tmp/diff_new_pack.D11677/_old 2009-03-18 01:12:14.000000000 +0100
+++ /var/tmp/diff_new_pack.D11677/_new 2009-03-18 01:12:14.000000000 +0100
@@ -17,16 +17,12 @@
# norootforbuild
-%define prebuilt_manpages 1
Name: module-init-tools
BuildRequires: zlib-devel
-%if ! %prebuilt_manpages
-BuildRequires: docbook-utils
-%endif
Version: 3.7
-Release: 2
-%define real_version 3.7-pre1
+Release: 3
+%define real_version 3.7-pre9
License: GPL v2 or later
Group: System/Kernel
# for grepping /etc/SUSE-release
@@ -42,20 +38,17 @@
Summary: Utilities to Load Modules into the Kernel
Url: http://www.kerneltools.org/
Source0: http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/module-i...
-%if %prebuilt_manpages
-Source1: module-init-tools-manpages-%real_version.tar.gz
-%endif
Source2: package-manpages.sh
Source4: README.SUSE
Source6: modprobe.conf.tar.gz
-Source7: depmod.conf
-Source8: unsupported-modules
+Source7: depmod-00-system.conf
+Source8: 10-unsupported-modules.conf
Source9: weak-modules
Source10: weak-modules2
# upstream patches
-# (none)
+Patch1: docbook2man.patch
+Patch2: enable-zlib-dynamic.patch
# suse patches
-Patch10: revert-search-all-config-files.patch
Patch11: mit-zlibsupport-use-mmap.patch
Patch12: modprobe-different-exit-codes.patch
Patch13: mit-unsupported-modules.patch
@@ -79,17 +72,11 @@
%prep
%setup -q -n %name-%real_version -a6
-%if %prebuilt_manpages
-%setup -q -n %name-%real_version -TD -b1
-%endif
-%patch10 -p1
+%patch1 -p1
+%patch2 -p1
%patch11
%patch12
%patch13
-%if %prebuilt_manpages
-# don't try to regenerate the patched manpages (patch5)
-touch modprobe.conf.5 modprobe.8
-%endif
%build
autoreconf --force --install
@@ -97,7 +84,7 @@
./configure \
--prefix=/ \
--mandir=%{_mandir} \
- --enable-zlib
+ --enable-zlib-dynamic
make %{?jobs:-j%jobs}
%install
@@ -109,17 +96,18 @@
# now assemble the parts for modprobe.conf
#
cd modprobe.conf
-cp modprobe.conf.common modprobe.conf
+cp modprobe.conf.common 00-system.conf
if [ -f modprobe.conf.$RPM_ARCH ] ; then
- cat modprobe.conf.$RPM_ARCH >> modprobe.conf
+ cat modprobe.conf.$RPM_ARCH >> 00-system.conf
fi
-cat modprobe.conf.last >> modprobe.conf
install -d -m 755 $RPM_BUILD_ROOT/etc/modprobe.d
-install -m644 %_sourcedir/unsupported-modules $RPM_BUILD_ROOT/etc/modprobe.d
-install -m644 modprobe.conf $RPM_BUILD_ROOT/etc/modprobe.conf
-install -m644 modprobe.conf.local $RPM_BUILD_ROOT/etc/modprobe.conf.local
+install -m644 %_sourcedir/10-unsupported-modules.conf \
+ $RPM_BUILD_ROOT/etc/modprobe.d/
+install -m644 00-system.conf $RPM_BUILD_ROOT/etc/modprobe.d/
+install -m644 modprobe.conf.local $RPM_BUILD_ROOT/etc/modprobe.d/99-local.conf
install -d -m 755 $RPM_BUILD_ROOT/etc/depmod.d
-install -m 644 %_sourcedir/depmod.conf $RPM_BUILD_ROOT/etc/
+install -m 644 %_sourcedir/depmod-00-system.conf \
+ $RPM_BUILD_ROOT/etc/depmod.d/00-system.conf
install -d -m 755 $RPM_BUILD_ROOT/usr/lib/%name
#install -m 755 modindex $RPM_BUILD_ROOT/usr/lib/%name/
install -m 755 %_sourcedir/weak-modules{,2} $RPM_BUILD_ROOT/usr/lib/%name/
@@ -166,28 +154,57 @@
return
fi
}
+# upgrade from old locations
+if test -e /etc/modprobe.d/unsupported-modules; then
+ mv -f /etc/modprobe.d/unsupported-modules \
+ /etc/modprobe.d/10-unsupported-modules.conf
+fi
+if test -e /etc/modprobe.conf.local; then
+ mv -f /etc/modprobe.conf.local \
+ /etc/modprobe.d/99-local.conf
+fi
test_allow_on_install "$@"
if test "$allow" = "0"; then
sed -ri 's/^( *allow_unsupported_modules *) 1/\1 0/' \
- /etc/modprobe.d/unsupported-modules
+ /etc/modprobe.d/10-unsupported-modules.conf
fi
%files
%defattr(-,root,root)
-%config /etc/modprobe.conf
-%config /etc/depmod.conf
+%dir /etc/modprobe.d
+%config /etc/modprobe.d/00-system.conf
+%config(noreplace) /etc/modprobe.d/10-unsupported-modules.conf
+%config(noreplace) /etc/modprobe.d/99-local.conf
%dir /etc/depmod.d
-%config(noreplace) /etc/modprobe.d/unsupported-modules
-%config(noreplace) /etc/modprobe.conf.local
+%config /etc/depmod.d/00-system.conf
%doc AUTHORS COPYING ChangeLog FAQ NEWS README TODO
%doc README.SUSE
%doc %{_mandir}/man?/*
/bin/*
/sbin/*
/usr/lib/%name
-/etc/modprobe.d
%changelog
+* Tue Mar 17 2009 mmarek@suse.cz
+- updated to 3.7-pre9
+ * code cleanup & minor fixes
+- link zlib dynamically
+* Tue Mar 10 2009 mmarek@suse.cz
+- modprobe.conf.tar.gz: removed unneeded/duplicate aliases and
+ aliases to non-existing modules. In case something breaks,
+ aliases should be added back with a reference to a bugreport
+ explaining why the alias is needed and why it can't be added to
+ the module itself.
+* Tue Mar 10 2009 mmarek@suse.cz
+- depmod-00-system.conf: do not generate modules.*map files by
+ default
+* Mon Mar 09 2009 mmarek@suse.cz
+- updated to 3.7-pre7
+ * modprobe now uses /etc/modprobe.d/*.conf as it's sole source of
+ configuration (files without .conf are still read, but cause a
+ warning). The local configuration file has been renamed to
+ /etc/modprobe.d/99-local.conf. Packages should install their
+ configuration files as /etc/modprobe.d/50-<name>.conf
* Mon Mar 02 2009 mmarek@suse.cz
- weak-modules2: explicitly set name-version-release query format
in rpm -q (bnc#479329)
++++++ 10-unsupported-modules.conf ++++++
#
# Every kernel module has a flag 'supported'. If this flag is not set loading
# this module will taint your kernel. You will not get much help with a kernel
# problem if your kernel is marked as tainted. In this case you firstly have
# to avoid loading of unsupported modules.
#
# Setting allow_unsupported_modules 1 enables loading of unsupported modules
# by modprobe, setting allow_unsupported_modules 0 disables it. This can
# be overriden using the --allow-unsupported-modules commandline switch.
allow_unsupported_modules 1
++++++ depmod-00-system.conf ++++++
#
# /etc/depmod.conf - configuration file for the depmod(8) command,
# for its format see depmod.conf(5).
#
# Please don't edit this file, place your settings into the /etc/depmod.d
# directory.
# search order:
# 1 updates/ (KMPs)
# 2 extra/ (KMPs or manually compiled modules)
# 3 weak-updates/ (KMPs built for older kernels)
# 4 everything else
search updates extra weak-updates built-in
# do not generate modules.*map files
make_map_files no
++++++ docbook2man.patch ++++++
commit 70482ca5966e956ac999798878f891e06c5ca630
Author: Michal Marek
Date: Mon Mar 9 19:44:28 2009 +0100
Don't abort the build if docbook2man is missing
Instead of aborting the build, print a warning if neither
docbook2man nor docbook-to-man is found.
Signed-off-by: Michal Marek
diff --git a/configure.ac b/configure.ac
index 9f09102..7b860b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,9 @@ AC_PROG_CC
AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, [no],)
if test x"$DOCBOOKTOMAN" = xno
then
- AC_MSG_ERROR([docbook2man not found])
+ AC_MSG_WARN([docbook2man not found])
+ # fail with a meaningfull error if $DOCBOOKTOMAN called by the makefile
+ DOCBOOKTOMAN='${top_srcdir}/missing docbook2man'
fi
# Delay adding the zlib_flags until after AC_PROG_CC, so we can distinguish
++++++ enable-zlib-dynamic.patch ++++++
commit 4873acc689919d876c3c3d486982ea3a7ea2e418
Author: Michal Marek
Date: Tue Mar 17 17:37:54 2009 +0100
Allow to link zlib dynamically
Add new configure option --enable-zlib-dynamic to allow linking zlib
dynamically (e.g. opensuse installs libz.so.1 in /lib, so it's safe to
do it there).
diff --git a/configure.ac b/configure.ac
index 7b860b1..8089c7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,15 @@ AC_ARG_ENABLE(zlib,
zlib_flags="-Wl,-Bstatic -lz -Wl,-Bdynamic"
fi])
+AC_ARG_ENABLE(zlib-dynamic,
+[ --enable-zlib-dynamic Handle gzipped modules, libz will be linked
+ dynamically. Note that libz must be installed in
+ /lib for this to work.],
+[if test "$enableval" = "yes"; then
+ AC_DEFINE(CONFIG_USE_ZLIB)
+ zlib_flags="-lz"
+fi])
+
AC_PROG_CC
AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, [no],)
++++++ mit-unsupported-modules.patch ++++++
--- /var/tmp/diff_new_pack.D11677/_old 2009-03-18 01:12:15.000000000 +0100
+++ /var/tmp/diff_new_pack.D11677/_new 2009-03-18 01:12:15.000000000 +0100
@@ -1,14 +1,16 @@
---
doc/modprobe.conf.sgml | 13 +++++++++++
doc/modprobe.sgml | 19 ++++++++++++++++
- modprobe.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 88 insertions(+)
+ modprobe.8 | 9 +++++++
+ modprobe.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++
+ modprobe.conf.5 | 7 ++++++
+ 5 files changed, 105 insertions(+)
Index: modprobe.c
===================================================================
--- modprobe.c.orig
+++ modprobe.c
-@@ -52,6 +52,9 @@
+@@ -50,6 +50,9 @@
int use_binary_indexes = 1; /* default to enabled. */
@@ -18,7 +20,7 @@
extern long init_module(void *, unsigned long, const char *);
extern long delete_module(const char *, unsigned int);
-@@ -566,6 +569,23 @@ static void clear_magic(struct module *m
+@@ -469,6 +472,23 @@ static void clear_magic(struct module *m
}
}
@@ -42,7 +44,7 @@
struct module_options
{
struct module_options *next;
-@@ -904,6 +924,16 @@ static void insmod(struct list_head *lis
+@@ -800,6 +820,16 @@ static int insmod(struct list_head *list
goto out_unlock;
}
@@ -59,26 +61,24 @@
/* Rename it? */
if (newname)
rename_module(mod, map, len, newname);
-@@ -1286,6 +1316,18 @@ static int read_config_file(const char *
- if (strcmp(tmp, "no") == 0)
+@@ -1155,6 +1185,16 @@ static int parse_config_file(const char
+ if (streq(tmp, "no"))
use_binary_indexes = 0;
}
+ } else if (strcmp(cmd, "allow_unsupported_modules") == 0) {
+ const char *option = strsep_skipspace(&ptr, "\t ");
+ if (!option)
+ grammar(cmd, filename, linenum);
-+ else if (strcmp(option, "yes") == 0 ||
-+ strcmp(option, "1") == 0)
++ else if (streq(option, "yes") || streq(option, "1"))
+ allow_unsupported = 1;
-+ else if (strcmp(option, "no") == 0 ||
-+ strcmp(option, "0") == 0)
++ else if (streq(option, "no") || streq(option, "0"))
+ allow_unsupported = 0;
+ else
+ grammar(cmd, filename, linenum);
} else
grammar(cmd, filename, linenum);
-@@ -1592,6 +1634,7 @@ static struct option options[] = { { "ve
+@@ -1487,6 +1527,7 @@ static struct option options[] = { { "ve
{ "dirname", 1, NULL, 'd' },
{ "first-time", 0, NULL, 3 },
{ "dump-modversions", 0, NULL, 4 },
@@ -86,7 +86,7 @@
{ "use-blacklist", 0, NULL, 'b' },
{ NULL, 0, NULL, 0 } };
-@@ -1614,6 +1657,7 @@ int main(int argc, char *argv[])
+@@ -1507,6 +1548,7 @@ int main(int argc, char *argv[])
int first_time = 0;
int dump_modver = 0;
int use_blacklist = 0;
@@ -94,7 +94,7 @@
unsigned int i, num_modules;
char *type = NULL;
const char *config = NULL;
-@@ -1714,6 +1758,9 @@ int main(int argc, char *argv[])
+@@ -1605,6 +1647,9 @@ int main(int argc, char *argv[])
case 4:
dump_modver = 1;
break;
@@ -104,9 +104,9 @@
default:
print_usage(argv[0]);
}
-@@ -1794,6 +1841,16 @@ int main(int argc, char *argv[])
+@@ -1679,6 +1724,16 @@ int main(int argc, char *argv[])
/* Returns the resolved alias, options */
- read_toplevel_config(config, modulearg, 0,
+ parse_toplevel_config(config, modulearg, 0,
remove, &modoptions, &commands, &aliases, &blacklist);
+ if (force_allow_unsupported)
+ allow_unsupported = 1;
@@ -120,13 +120,13 @@
+ }
/* Read module options from kernel command line */
- read_kcmdline(0, &modoptions);
+ parse_kcmdline(0, &modoptions);
Index: doc/modprobe.sgml
===================================================================
--- doc/modprobe.sgml.orig
+++ doc/modprobe.sgml
-@@ -435,9 +435,28 @@
- </para>
+@@ -448,9 +448,28 @@
+ </para>
</listitem>
</varlistentry>
+ <varlistentry>
@@ -178,3 +178,41 @@
</variablelist>
</refsect1>
<refsect1>
+Index: modprobe.8
+===================================================================
+--- modprobe.8.orig
++++ modprobe.8
+@@ -234,6 +234,15 @@ any) to module names as well. It is usu
+ \fB-d --dirname \fR
+ Directory where modules can be found, /lib/modules/RELEASE
+ by default.
++.TP
++\fB--allow-unsupported-modules \fR
++Load unsupported modules even if disabled in configuration.
++.SH "RETURN VALUE"
++.PP
++\fBmodprobe\fR returns 0 on success, 1 on an unspecified
++error and 2 if the module is not supported. Use the
++\fB--allow-unsupported-modules\fR option to force
++using an unsupported module.
+ .SH "BACKWARDS COMPATIBILITY"
+ .PP
+ This version of \fBmodprobe\fR is for kernels
+Index: modprobe.conf.5
+===================================================================
+--- modprobe.conf.5.orig
++++ modprobe.conf.5
+@@ -118,6 +118,13 @@ or more modules both support the same de
+ invalidly claims to support a device: the
+ \fBblacklist\fR keyword indicates that all of
+ that particular module's internal aliases are to be ignored.
++.TP
++\fBallow_unsupported_modules \fI[0|1]\fB \fR
++In SUSE kernels, every kernel module has a flag 'supported'. If
++this flag is not set loading this module will taint your kernel.
++Setting this option to 0 disables loading of unsupported modules
++and avoids tainting the kernel. This is typically set in
++\fI/etc/modprobe.d/unsupported-modules\fR\&.
+ .SH "BACKWARDS COMPATIBILITY"
+ .PP
+ There is a \fBgenerate_modprobe.conf\fR program
++++++ 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 2009-01-06 13:31:43.000000000 +0100
+++ new/modprobe.conf/modprobe.conf.common 2009-03-17 12:54:49.000000000 +0100
@@ -7,130 +7,22 @@
# Configuration file for loadable modules; used by modprobe
#
# Please don't edit this file. Place your settings into
-# /etc/modprobe.conf.local instead.
+# /etc/modprobe.d/99-local.conf instead.
#
#
########################################################################
-# Aliases - specify your hardware
-########################################################################
-
-install eth0 /bin/true
-install eth1 /bin/true
-install tr0 /bin/true
-install scsi_hostadapter /bin/true
-install fb0 /bin/true
-
-########################################################################
-# only used for Mylex or Compaq Raid as module
-########################################################################
-
-install block-major-48 /bin/true
-install block-major-49 /bin/true
-install block-major-72 /bin/true
-install block-major-73 /bin/true
-
-########################################################################
-# only needed for fifth and sixth IDE adaptor
-########################################################################
-
-install block-major-56 /bin/true
-install block-major-57 /bin/true
-
-########################################################################
-# mouse (for older busmice)
-########################################################################
-
-install char-major-10 /bin/true
-
-########################################################################
# If you want to use the new autofs4
########################################################################
alias autofs autofs4
-########################################################################
-# For parallel port devices, uncomment the following two lines and
-# change "frpw" to the protocol type you use
-########################################################################
-
-# install paride /sbin/modprobe --ignore-install paride && { /sbin/modprobe --ignore-install frpw; }
-# remove paride { /sbin/modprobe -r --ignore-remove frpw; } ; /sbin/modprobe -r --ignore-remove paride
-
-########################################################################
-# Options; these are examples; uncomment and modify the lines you need
-########################################################################
-
-# options cdu31a cdu31a_port=0x340 cdu31a_irq=0
-# options aztcd aztcd=0x320
-# options cm206 cm206=0x340,11
-# options gscd gscd=0x340
-# options mcdx mcdx=0x300,11
-# options optcd optcd=0x340
-# options sjcd sjcd_base=0x340
-# options sonycd535 sonycd535=0x340
-
-# options ne io=0x300 irq=5
-
-# Use this if you have two cards:
-# options ne io=0x300,0x320 irq=5,7
-
-# options tulip options=0
-# options 3c59x options=0
-# options 3c501 io=0x280 irq=5
-# options 3c503 io=0x280 irq=5 xcvr=0
-# options 3c505 io=0x300 irq=10
-# options 3c507 io=0x300 irq=10
-# options 3c509 irq=10
-# options at1700 io=0x260 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 io=0x300 irq=10
-# options hp100 hp100_port=0x380
-# options ac3200 io=0x300 irq=10 mem=0xd0000
-# options de620 io=0x378 irq=7 bnc=1
-# options ibmtr io=0xa20
-# options arcnet io=0x300 irq=10 shmem=0xd0000
-# options plip io=0x378 irq=7
-# options eepro io=0x260 irq=10 mem=0x6000
-# options eth16i io=0x2a0 irq=10
-# options ni52 io=0x360 irq=9 memstart=0xd0000 memend=0xd4000
-# options bttv pll=1 radio=0 card=0
-# options tuner type=0
-# options msp3400 once=1 simple=1
-
-# install bttv /sbin/modprobe --ignore-install bttv && { /sbin/modprobe -k tuner; /sbin/modprobe -k msp3400; }
-#
-
-install dummy0 /sbin/modprobe -o dummy0 --ignore-install dummy
-install dummy1 /sbin/modprobe -o dummy1 --ignore-install dummy
-remove dummy0 /sbin/modprobe -r -o dummy0 --ignore-remove dummy
-remove dummy1 /sbin/modprobe -r -o dummy1 --ignore-remove dummy
########################################################################
# block dev aliases
########################################################################
-install block-major-3 /bin/true
-alias block-major-13 xd
-alias block-major-15 cdu31a
-alias block-major-16 gscd
-alias block-major-17 optcd
-alias block-major-18 sjcd
-alias block-major-20 mcdx
-install block-major-22 /bin/true
-alias block-major-24 sonycd535
-alias block-major-29 aztcd
-alias block-major-32 cm206
-install block-major-33 /bin/true
-install block-major-34 /bin/true
# network block device
-install block-major-43 /bin/true
alias block-major-45 pd
-alias block-major-46 pcd
alias block-major-47 pf
########################################################################
@@ -139,49 +31,9 @@
install char-major-10-134 /bin/true
install char-major-10-135 /bin/true
-alias char-major-10-175 agpgart
alias char-major-10-181 toshiba
alias char-major-10-250 sonypi
options sonypi minor=250
-install char-major-15 /bin/true
-alias char-major-19 cyclades
-alias char-major-20 cyclades
-install char-major-29 /bin/true
-# 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-67 coda
-alias char-major-75 specialix
-alias char-major-76 specialix
-alias char-major-81 videodev
-install char-major-81-0 /bin/true
-install char-major-81-1 /bin/true
-install char-major-81-2 /bin/true
-install char-major-81-3 /bin/true
-
-alias char-major-96 pt
-alias char-major-97 pg
-# remove this if sound is configured
-install char-major-116 /bin/true
-
-########################################################################
-# ppp over ethernet
-# the kernel 2.2 uses pppox
-# the kernel 2.4 uses pppoe
-########################################################################
-
-alias char-major-144 pppoe
-
-########################################################################
-# IrDA
-########################################################################
-
-alias char-major-161 ircomm-tty
-
-alias char-major-162 raw
########################################################################
# ISDN
@@ -196,79 +48,6 @@
install pcbit /bin/true
install t1pci /bin/true
install divas /bin/true
-install fcdsl /bin/true
-install fcdsl2 /bin/true
-install fcpci /bin/true
-install fcpnp /bin/true
-install fcdslsl /etc/sysconfig/isdn/scripts/hotplug_pci
-
-########################################################################
-# USB
-########################################################################
-
-install char-major-166 /bin/true
-
-########################################################################
-# Moxa Multiport Serial Boards
-########################################################################
-
-alias char-major-172 moxa
-alias char-major-173 moxa
-
-# options moxa type=2,,, baseaddr=0xdc000,,, numports=8,,,
-alias char-major-174 mxser
-alias char-major-175 mxser
-# options mxser ioaddr=0x180
-
-#alias char-major-180 usbcore
-
-alias char-major-188 usbserial
-
-alias char-major-212 /bin/true
-
-alias binfmt-204 binfmt_aout
-alias binfmt-263 binfmt_aout
-alias binfmt-264 binfmt_aout
-alias binfmt-267 binfmt_aout
-alias binfmt-0064 binfmt_aout
-alias binfmt-0008 binfmt_aout
-
-alias iso9660 isofs
-
-# alias tty-ldisc-7 6pack
-install tty-ldisc-7 /bin/true
-
-# alias ax0 mkiss
-install ax0 /bin/true
-# alias sp0 6pack
-install sp0 /bin/true
-alias slip0 slip
-alias sl0 slip
-alias slip1 slip
-alias sl1 slip
-
-########################################################################
-# the kernel 2.2 uses ppp.o as ppp driver,
-# the kernel 2.4 uses ppp_generic.o
-########################################################################
-
-alias ppp0 ppp_generic
-alias ppp1 ppp_generic
-
-alias plip0 plip
-alias plip1 plip
-
-# Tunnel interfaces
-alias sit0 ipv6
-alias gre0 ip_gre
-alias ipip0 ipip
-
-alias xfrm-type-2-50 esp4
-alias xfrm-type-2-51 ah4
-alias xfrm-type-2-108 ipcomp
-alias xfrm-type-10-50 esp6
-alias xfrm-type-10-51 ah6
-alias xfrm-type-10-108 ipcomp6
# NFS
alias nfs4 nfs
@@ -276,7 +55,7 @@
# rpc_pipefs
install rpc_pipefs /sbin/modprobe sunrpc
-# we don't want ide-scsi handle CD drives [#242009]
+# we don't want ide-scsi handle CD drives (bnc#242009)
options ide-scsi idescsi_nocd=1
# pata_acpi is useful for certain limited cases but it tries to attach any
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/modprobe.conf/modprobe.conf.last new/modprobe.conf/modprobe.conf.last
--- old/modprobe.conf/modprobe.conf.last 2009-02-10 16:07:06.000000000 +0100
+++ new/modprobe.conf/modprobe.conf.last 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-# please keep this at the end and add local modifications to modprobe.conf.local
-include /etc/modprobe.d
-include /etc/modprobe.conf.local
++++++ modprobe-different-exit-codes.patch ++++++
--- /var/tmp/diff_new_pack.D11677/_old 2009-03-18 01:12:15.000000000 +0100
+++ /var/tmp/diff_new_pack.D11677/_new 2009-03-18 01:12:15.000000000 +0100
@@ -8,7 +8,7 @@
===================================================================
--- logging.c.orig
+++ logging.c
-@@ -44,12 +44,14 @@ void warn(const char *fmt, ...)
+@@ -61,13 +61,15 @@ void error(const char *fmt, ...)
va_end(arglist);
}
@@ -24,17 +24,18 @@
+ exit(fatal_exit_code);
}
+ /* If we don't flush, then child processes print before we do */
Index: logging.h
===================================================================
--- logging.h.orig
+++ logging.h
-@@ -7,6 +7,9 @@ extern int logging;
- /* Number of times warn() has been called */
- extern int warned;
+@@ -13,6 +13,9 @@ extern int warned;
+ /* Do we want informative messages as well as errors? */
+ extern int verbose;
+/* Exit code returned by fatal() */
+extern int fatal_exit_code;
+
extern void fatal(const char *fmt, ...);
+ extern void error(const char *fmt, ...);
extern void warn(const char *fmt, ...);
-
++++++ module-init-tools-3.7-pre1.tar.bz2 -> module-init-tools-3.7-pre9.tar.bz2 ++++++
++++ 32358 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org