Hi LaMont and Release Team, I have dedicated some time to start preparing a modutils NMU fixing both the current RC bugs and lot of longstanding bugs currently present and really easy to fix. Attached is the resulting patch (currently untested, I want to keep working on adding some more fixes). I don't know if I'll make it in time for having it sufficiently tested so that it can go into the release..... Please tell me if you approve of this patch, and, if not, the reasons you reject it. I would really like to help you weed bugs out of this package. Release team, I would also appreciate some action on this, since it seems that some users (PPPOE users using d-i and some users upgrading from older releases) will need this new version in order to install/use their Debian system properly. Also notice that there is a new upstream, and it has some bug fixes that might be appropiate to include too, if everyone is OK with it, I could NMU based on the latest upstream release. Regards Javier
diff -Nru modutils-2.4.26.old/debian/changelog modutils-2.4.26/debian/changelog
--- modutils-2.4.26.old/debian/changelog 2004-09-25 18:47:08.000000000 +0200
+++ modutils-2.4.26/debian/changelog 2004-10-22 16:59:53.000000000 +0200
@@ -1,3 +1,58 @@
+modutils (2.4.26-1.1) unstable; urgency=high
+
+ * NMU. Urgency set to 'high' as this version fixes a number of RC and
+ longstanding bugs that we probably want to have fixed for sarge.
+ [debian/conf/aliases]
+ - Added missing aliases to modutils based on patches from other vendors
+ (Fedora Core 2 and Mandrake 10) and from the modules defined in
+ module-init-tools for kernels 2.6 and above. These include aliases for:
+ - pppoe (Closes: #262941, #263224, #272581)
+ - ipsec (Closes: #203578
+ - ide-prob-mod incantation aliases due to module name changes
+ done in 2.4.22 (Closes: #228031, #210516)
+ - psmouse (Closes: #230020)
+ - zftape (Closes: #70557)
+ - raw (Closes: #228688)
+ - cpuid and msr (Closes: #243681)
+ - ppp_mppe (Closes: #173938)
+ [util/alias.h]
+ - Included RedHat's patch that modifies the behaviour of
+ modprobe for some systems that do not provide a floppy disk
+ (like s390, powerpc...)
+ - Updated some aliases definitions.
+ [debian/update-modules]
+ - Apply patch to avoid loading configuration files
+ suffixed with '.orig' as per Joey's request (Closes: #54967)
+ - Avoid also loading RCS files (,v suffix) as requested by Mark Histed
+ (Closes: #118647)
+ - Do not use depfile statements if commented in modules.conf
+ (Closes: #69754)
+ - Abort with exit code 3 if configuration files are not automatically
+ generated (Closes: #166531)
+ - Add a check in addfile() so that dangling symlinks are avoided, the code
+ should not get there (because of the previous -f check) but this should
+ avoid the issue observed by users which breaks upgrades (Closes: #220382)
+ - More verbose message when encoutering errors executing scripts under
+ /etc/modutils as it has been reported by a user that there might be
+ files with incorrect execute permissions set (Closes: #253508)
+ - Removed trailing " when setting the HEADER (Closes: #173746)
+ [debian/update-modules.8]
+ - Reworded sentence for clarity as suggested by Robert Millan
+ (Closes: #140776)
+ - Added new suffixes that will not be loaded (.orig and ,v)
+ - Document current exit codes (0=no error, 1=error, 2=not root,
+ 3=not autogenerated)
+ [debian/control]
+ - Mention module-init-tools (for 2.6 users) in the package description
+ (Closes: #267112)
+ [ Translations ]
+ - Included the following manpage translations:
+ * pt_BR provided by Philippe Gaspar (Closes: #194502)
+ * es provided by Ruben Porras (Closes: #206205)
+ * fr provided by Julien Louis (Closes: #165098, #166713)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org> Fri, 22 Oct 2004 16:37:54 +0200
+
modutils (2.4.26-1) unstable; urgency=low
* New upstream release.
diff -Nru modutils-2.4.26.old/debian/conf/aliases modutils-2.4.26/debian/conf/aliases
--- modutils-2.4.26.old/debian/conf/aliases 2004-09-25 18:47:08.000000000 +0200
+++ modutils-2.4.26/debian/conf/aliases 2004-10-22 16:11:56.000000000 +0200
@@ -1,4 +1,4 @@
-# Aliases to tell insmod/modprobe which modules to use
+# Aliases to tell insmod/modprobe which modules to use
# Uncomment the network protocols you don't want loaded:
# alias net-pf-1 off # Unix
@@ -11,18 +11,131 @@
# 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 net-pf-20 off # ATM
+# alias net-pf-23 off # IRDA
+# alias net-pf-24 off # PPPoE
+# alias net-pf-25 off # WANrouter
+# alias net-pf-26 off # Llc
+# alias net-pf-31 off # Bluetooth
+alias binfmt-204 binfmt_aout
+alias binfmt-263 binfmt_aout
+alias binfmt-264 binfmt_aout
+alias binfmt-267 binfmt_aout
+alias binfmt-387 binfmt_aout
+
+alias bt-proto-0 l2cap
+alias bt-proto-2 sco
+alias bt-proto-3 rfcomm
+alias bt-proto-4 bnep
+alias bt-proto-5 cmtp
+alias bt-proto-6 hidp
+alias bt-proto-7 avdtp
+
+alias char-major-9 st
+alias char-major-10-1 psmouse
+alias char-major-10-134 apm
+alias char-major-10-135 rtc
+alias char-major-10-139 openprom
+alias char-major-10-144 nvram
+alias char-major-10-157 applicom
alias char-major-10-175 agpgart
+alias char-major-10-181 toshiba
+alias char-major-10-183 hw_random
+alias char-major-10-184 microcode
+alias char-major-10-187 irnet
+alias char-major-10-189 ussp
alias char-major-10-200 tun
+alias char-major-10-250 hci_vhci
+alias char-major-13 input
+alias char-major-13-0 joydev
+alias char-major-13-1 joydev
+alias char-major-13-2 joydev
+alias char-major-13-3 joydev
+alias char-major-13-32 mousedev
+alias char-major-13-33 mousedev
+alias char-major-13-34 mousedev
+alias char-major-13-35 mousedev
+alias char-major-13-63 mousedev
+alias char-major-13-64 evdev
+alias char-major-13-65 evdev
+alias char-major-13-66 evdev
+alias char-major-13-67 evdev
+alias char-major-19 cyclades
+alias char-major-20 cyclades
+alias char-major-21 sg
+alias char-major-22 pcxx
+alias char-major-23 pcxx
+alias char-major-27 ftape
+alias char-major-27 zftape
+alias char-major-34 scc
+alias char-major-35 tclmidi
+alias char-major-37 ide-tape
+alias char-major-48 riscom8
+alias char-major-49 riscom8
+alias char-major-57 esp
+alias char-major-58 esp
+alias char-major-63 kdebug
+alias char-major-67 coda
+alias char-major-75 specialix
+alias char-major-76 specialix
alias char-major-81 bttv
+alias char-major-81 videodev
+alias char-major-83 vtx
+alias char-major-89 i2c-dev
+alias char-major-90 mtdchar
+alias char-major-96 pt
+alias char-major-97 pg
+alias char-major-99 ppdev
+alias char-major-107 3dfx
+alias char-major-109 lvm-mod
alias char-major-108 ppp_generic
+alias char-major-116 snd
+alias char-major-161 ircomm-tty
+alias char-major-162 raw
+alias char-major-166 cdc_acm
+alias char-major-171 raw1394
+alias char-major-180-48 scanner
+alias char-major-180 usbcore
+alias char-major-195 nvidia
+alias char-major-200 vxspec
+alias char-major-202 msr
+alias char-major-203 cpuid
+alias char-major-206 osst
+alias char-major-208 ussp
+alias char-major-227 tub3270
alias /dev/ppp ppp_generic
alias tty-ldisc-3 ppp_async
alias tty-ldisc-14 ppp_synctty
+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 dummy0 dummy
+alias dummy1 dummy
+alias gre0 ip_gre
+alias iso9660 isofs
+alias plip0 plip
+alias plip1 plip
+alias slip0 slip
+alias slip1 slip
+alias tunl0 ipip
+alias usbdevfs usbcore
+alias cipcb0 cipcb
+alias cipcb1 cipcb
+alias cipcb2 cipcb
+alias cipcb3 cipcb
+
+# IPSEC
+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
+
+
# Crypto modules (see http://www.kerneli.org/)
alias loop-xfer-gen-0 loop_gen
alias loop-xfer-3 loop_fish2
@@ -38,3 +151,9 @@
alias cipher-16 rijndael
alias cipher-17 rc5
+# IDE modules changed names in 2.4.22
+if KERNEL_VER >= 2.4.22
+ alias ide-mod ide-core
+ alias ide-probe-mod ide-detect
+endif
+
diff -Nru modutils-2.4.26.old/debian/control modutils-2.4.26/debian/control
--- modutils-2.4.26.old/debian/control 2004-09-25 18:47:08.000000000 +0200
+++ modutils-2.4.26/debian/control 2004-10-22 16:48:13.000000000 +0200
@@ -12,9 +12,10 @@
Replaces: manpages (<=1.15-3)
Suggests: ksymoops
Description: Linux module utilities
- These utilities are intended to make a Linux modular kernel
- manageable for all users, administrators and distribution
- maintainers.
+ These utilities are intended to make a Linux modular 2.2 or 2.4
+ kernel manageable for all users, administrators and distribution
+ maintainers. For 2.6 kernels, you should use the module-init-tools
+ package.
Package: modutils-basic
Section: debian-installer
diff -Nru modutils-2.4.26.old/debian/modules.es.5 modutils-2.4.26/debian/modules.es.5
--- modutils-2.4.26.old/debian/modules.es.5 1970-01-01 01:00:00.000000000 +0100
+++ modutils-2.4.26/debian/modules.es.5 2004-10-22 16:49:42.000000000 +0200
@@ -0,0 +1,18 @@
+.\" (c) 2003 Software in the Public Interest
+.\" Esta traducción ha sido realizada por Rubén Porras Campo <nahoo@inicia.es>
+.\" Está basada en la página de manual original:
+.\" versión 1.1 del CVS de /cvs/debian-doc/manpages/english/modutils/modules.5
+
+.TH MODULES 5 "Versión 1.1" "Debian GNU/Linux"
+.SH NOMBRE
+/etc/modules - módulos que se cargan en el arranque
+.SH DESCRIPCIÓN
+.PP
+El fichero
+.B /etc/modules
+contiene los nombres de los módulos de núcleo que se cargarán en el arranque,
+uno por línea. Los argumentos se pueden proporcionar en la misma línea junto
+con el nombre del módulo. Los comentarios comienzan con un `#', todo lo que
+haya en la línea a continuación será ignorado.
+.SH TRADUCTOR
+Traducción de Rubén Porras Campo <debian-l10n-spanish@lists.debian.org>
diff -Nru modutils-2.4.26.old/debian/modules.fr.5 modutils-2.4.26/debian/modules.fr.5
--- modutils-2.4.26.old/debian/modules.fr.5 1970-01-01 01:00:00.000000000 +0100
+++ modutils-2.4.26/debian/modules.fr.5 2004-10-22 16:54:25.000000000 +0200
@@ -0,0 +1,15 @@
+.\"Traduction Lundi 14 octobre 2002 par Antoine Gémis
+.\"(agemis@netuup.com)
+.TH MODULES 4 "Version 1.1" "Debian GNU/Linux"
+.SH NOM
+/etc/modules - modules du noyau à charger au démarrage
+.SH DESCRIPTION
+.PP
+Le fichier
+.B /etc/modules
+contient la liste des modules du noyau à charger au démarrage, un module par
+ligne. Une ligne peut inclure, après le nom du module, des paramètres à lui
+passer. Sur une ligne, tout ce qui suit «\ #\ » sera considéré comme commentaire
+et ignoré.
+.SH TRADUCTION
+Antoine Gémis <agemis@netuup.com>.
diff -Nru modutils-2.4.26.old/debian/modules.pt_BR.5 modutils-2.4.26/debian/modules.pt_BR.5
--- modutils-2.4.26.old/debian/modules.pt_BR.5 1970-01-01 01:00:00.000000000 +0100
+++ modutils-2.4.26/debian/modules.pt_BR.5 2004-10-22 16:53:59.000000000 +0200
@@ -0,0 +1,11 @@
+.TH MODULES 5 "Version 1.1" "Debian GNU/Linux"
+.SH NOME
+/etc/modules - módulos do kernel a serem carregados na inicialização do sistema
+.SH DESCRIÇÃO
+.PP
+O arquivo
+.B /etc/modules
+contém os nomes dos módulos do kernel, um por linha, que são carregados na inicialização do sistema. Argumentos podem ser passados na mesma linha dos nomes dos
+módulos. Comentários começam com `#', e tudo que estiver depois dele é ignorado.
+.SH TRADUÇÃO
+Philipe Gaspar <philipegaspar@terra.com.br>
diff -Nru modutils-2.4.26.old/debian/rules modutils-2.4.26/debian/rules
--- modutils-2.4.26.old/debian/rules 2004-09-25 18:47:08.000000000 +0200
+++ modutils-2.4.26/debian/rules 2004-10-22 16:55:15.000000000 +0200
@@ -97,6 +97,13 @@
install -d -m 755 -o root -g root $(tmpdir)/usr/share/man/man5
install -d -m 755 -o root -g root $(tmpdir)/usr/share/man/man8
install -d -m 755 -o root -g root $(tmpdir)/lib/modules
+# For translations
+ install -d -m 755 -o root -g root $(tmpdir)/usr/share/man/es/man5
+ install -d -m 755 -o root -g root $(tmpdir)/usr/share/man/es/man8
+ install -d -m 755 -o root -g root $(tmpdir)/usr/share/man/fr/man5
+ install -d -m 755 -o root -g root $(tmpdir)/usr/share/man/fr/man8
+ install -d -m 755 -o root -g root $(tmpdir)/usr/share/man/pt_BR/man5
+ install -d -m 755 -o root -g root $(tmpdir)/usr/share/man/pt_BR/man8
cd $(build_dir) ; $(MAKE) prefix=$(tmpdir)/usr exec_prefix=$(tmpdir) \
sysconfdir=$(tmpdir)/etc install
@@ -148,6 +155,20 @@
$(tmpdir)/usr/share/man/man8/
gzip -9q $(tmpdir)/usr/share/man/man8/*8
+# Install translations
+ install -p -m 644 -o root -g root debian/update-modules.es.8 \
+ $(tmpdir)/usr/share/man/es/man8/update-modules.8
+ install -p -m 644 -o root -g root debian/modules.es.5 \
+ $(tmpdir)/usr/share/man/es/man5/modules.5
+ install -p -m 644 -o root -g root debian/update-modules.fr.8 \
+ $(tmpdir)/usr/share/man/fr/man8/update-modules.8
+ install -p -m 644 -o root -g root debian/modules.fr.5 \
+ $(tmpdir)/usr/share/man/fr/man5/modules.5
+ install -p -m 644 -o root -g root debian/update-modules.pt_BR.8 \
+ $(tmpdir)/usr/share/man/pt_BR/man8/update-modules.8
+ install -p -m 644 -o root -g root debian/modules.pt_BR.5 \
+ $(tmpdir)/usr/share/man/pt_BR/man5/modules.5
+
# Install configuration files
install -d -g root -m 755 -o root $(tmpdir)/etc/modutils
cp -a debian/conf/* $(tmpdir)/etc/modutils/
diff -Nru modutils-2.4.26.old/debian/update-modules modutils-2.4.26/debian/update-modules
--- modutils-2.4.26.old/debian/update-modules 2004-09-25 18:47:08.000000000 +0200
+++ modutils-2.4.26/debian/update-modules 2004-10-22 16:43:49.000000000 +0200
@@ -27,7 +27,7 @@
depdir()
{
- dep=`grep '[[:space:]]*depfile' "${MODCONFFILE}" | tail -n 1 | sed -e 's/depfile=//' -e 's,/[^/]*$,,'`
+ dep=`grep '[[:space:]]*depfile' "${MODCONFFILE}" | grep -v ^# | tail -n 1 | sed -e 's/depfile=//' -e 's,/[^/]*$,,'`
if [ -z "$dep" ] ; then
dep="/lib/modules/`uname -r`"
fi
@@ -101,7 +101,7 @@
echo "Error: the current $cfgfile is not automatically generated." >&2
if [ -z "$force" ]; then
echo "Use \"update-modules force\" to force (re)generation."
- exit 1
+ exit 3
else
echo "force specified, (re)generating file anyway."
fi
@@ -111,7 +111,7 @@
createfile() {
cat <<EOF > "$1"
-$HEADER"
+$HEADER
#
# Please do not edit this file directly. If you want to change or add
# anything please take a look at the files in /etc/modutils and read
@@ -128,10 +128,13 @@
if [ -x "$src" ]; then
if ! "$src" >> "$tgt" ; then
echo "Error while executing $src, aborting" >&2
+ echo "Note: If $src should not be an executable script, please ensure it does not have execute permission" >&2
exit 1
fi
- else
+ elif [ -e "$src" ] ; then
cat "$src" >> "$tgt"
+ else
+ echo "Warnings: $src does not exist (dangling symlink?)"
fi
cat <<EOF >> "$tgt"
@@ -182,7 +185,7 @@
if [ -f "$cfg" ]; then # this check is necesarry to skip /etc/modutils/archs
if [ "$dochandev" ] && echo $cfg | grep -q '\.chandev$' ; then
addfile "$cfg" "$CHANDEVTMPFILE"
- elif ! echo $cfg | grep -q '\(\.dpkg-[a-z]*\|~\)$' ; then
+ elif ! echo $cfg | grep -q '\(\.dpkg-[a-z]*\|\.orig|,v|~\)$' ; then
addfile "$cfg" "$MODCONFTMPFILE"
fi
fi
diff -Nru modutils-2.4.26.old/debian/update-modules.8 modutils-2.4.26/debian/update-modules.8
--- modutils-2.4.26.old/debian/update-modules.8 2004-09-25 18:47:08.000000000 +0200
+++ modutils-2.4.26/debian/update-modules.8 2004-10-22 15:56:16.000000000 +0200
@@ -8,9 +8,8 @@
.B update\-modules
is a simple tool to manage
.IR /etc/modules.conf
-and
+and, for the s390 architecture.
.IR /etc/chandev.conf
-for the s390 architecture.
The Linux module utilities use one configuration file for all their
configuration. This makes it hard for packages to dynamically add
information about their own modules. To fix this
@@ -35,6 +34,19 @@
.IR /etc/modules.conf.old
or
.IR /etc/chandev.conf.old .
+.PP
+An exit status of 0 means
+.B update-modules
+was successful, 1 means some conflicts were found, 2 means that the user
+attempting to run
+.B update-modules
+was not root and 3 means that the configuration file
+.B /etc/modules.conf
+or
+.B /etc/chandev.cof
+is \fInot\fR automatically generated (it will not get overwritten unless
+\fI--force\fR is used).
+
.SH "FILES"
There are two types of file you can put in
.IR /etc/modutils :
@@ -51,13 +63,15 @@
.B update\-modules
will ignore files that match the following regular expression:
.RS
-.B *\e(\e.dpkg\-[a\-z]*\e|~\e)$
+.B *\e(\e.dpkg\-[a\-z]*\e|\.orig|,v|~\e)$
.RE
(ie files with the extension
.IR .dpkg\-new ,
.IR .dpkg\-orig ,
.IR .dpkg\-dist ,
.IR .dpkg\-old ,
+.IR .orig ,
+.IR ,v ,
or whose filename end with a
.IR ~ ).
.SH OPTIONS
@@ -68,7 +82,7 @@
.I /etc/modules.conf and
.I /etc/chandev.conf
are generated files by checking for a special tag on the first line. If this
-tag is not found generation is aborted. By supplying
+tag is not found generation is aborted (with exit code 3). By supplying
.I force
as parameter only a warning is printed.
.SH "SEE ALSO"
diff -Nru modutils-2.4.26.old/debian/update-modules.es.8 modutils-2.4.26/debian/update-modules.es.8
--- modutils-2.4.26.old/debian/update-modules.es.8 1970-01-01 01:00:00.000000000 +0100
+++ modutils-2.4.26/debian/update-modules.es.8 2004-10-22 16:49:51.000000000 +0200
@@ -0,0 +1,92 @@
+.\" (c) 2003 Software in the Public Interest
+.\" Esta traducción ha sido realizada por Rubén Porras Campo <nahoo@inicia.es>
+.\" Está basada en la página de manual original:
+.\" versión 1.1 del CVS de /cvs/debian-doc/manpages/english/modutils/modutils.8
+
+.TH UPDATE-MODULES 8 "Herramientas Debian GNU/Linux" "DEBIAN"
+.SH NOMBRE
+update\-modules \- (re)genera /etc/modules.conf y /etc/chandev.conf
+.SH SINOPSIS
+.B update\-modules
+[force]
+.SH DESCRIPCIÓN
+.B update\-modules
+es una herramienta simple para manejar
+.IR /etc/modules.conf
+y
+.IR /etc/chandev.conf
+en la arquitectura s390.
+Las utilidades para módulos de Linux usan un fichero de configuración para todas
+sus configuraciones. Esto dificulta que los paquetes añadan dinámicamente
+información acerca de sus propios módulos.
+.B update\-modules
+se introdujo para solucionar esto.
+.PP
+.B update-modules
+intenta solucionarlo generando generando el fichero de configuración desde
+ficheros separados almacenados en
+.IR /etc/modutils .
+Todos los ficheros en ese directorio se ensamblan para formar
+.IR /etc/modules.conf
+y
+.IR /etc/chandev.conf .
+Además hay un subdirectorio especial
+.RI ( /etc/modutils/arch )
+que contiene información especial para arquitecturas especiales.
+.B update-modules
+determina la arquitectura y selecciona el fichero que debe usar.
+.PP
+Antes de sobreescribir los ficheros se guarda una copia de seguridad del fichero
+anterior en
+.IR /etc/modules.conf.old
+o
+.IR /etc/chandev.conf.old .
+.SH "FICHEROS"
+Hay dos tipos de ficheros que puede poner en
+.IR /etc/modutils :
+ficheros normales y ejecutables. Los ficheros normales contienen información de
+configuración de módulos estándar, tal y como se describe en
+.BR modules.conf (5).
+Ficheros con el sufijo .chandev contienen las opciones del módulo, tal y como se
+describe en
+.BR chandev (8).
+El fichero especial 0chandev.chandev contiene las opciones específicas de la
+capa de dispositivos de canal.
+Los ficheros ejecutables se ejecutan y su salida se usa como información de
+configuración extra. Los mensajes de error enviados a stderr no se redirigen.
+.PP
+.B update\-modules
+ignorará módulos que coincidan con la siguiente expresión regular:
+.RS
+.B *\e(\e.dpkg\-[a\-z]*\e|~\e)$
+.RE
+(p. ej. ficheros con la extensión
+.IR .dpkg\-new ,
+.IR .dpkg\-orig ,
+.IR .dpkg\-dist ,
+.IR .dpkg\-old ,
+o aquellos cuyo nombre termine con
+.IR ~ ).
+.SH OPCIONES
+.TP
+.I force
+.B update\-modules
+comprueba si los ficheros
+.I /etc/modules.conf y
+.I /etc/chandev.conf
+actuales son generados comprobando una marca especial en la primera línea. Si
+esta marca no se encuentra se aborta la generación. Si se proporciona
+.I force
+como parámetro, sólo se muestra un aviso.
+.SH "VÉASE ADEMÁS"
+.BR depmod (1)
+.BR modules.conf (5)
+.BR modprobe (8)
+.BR chandev (8),
+.SH FALLOS
+¡Ninguno, por supuesto! :)
+.SH AUTOR
+Esta página del manual fue escrita por Wichert Akkerman <wakkerma@debian.org>
+para el sistema Debian GNU/Linux.
+.SH TRADUCTOR
+Traducción de Rubén Porras Campo <debian-l10n-spanish@lists.debian.org>
diff -Nru modutils-2.4.26.old/debian/update-modules.fr.8 modutils-2.4.26/debian/update-modules.fr.8
--- modutils-2.4.26.old/debian/update-modules.fr.8 1970-01-01 01:00:00.000000000 +0100
+++ modutils-2.4.26/debian/update-modules.fr.8 2004-10-22 16:54:27.000000000 +0200
@@ -0,0 +1,93 @@
+.\"Traduction Vendredi 25 octobre 2002 par Antoine Gémis
+.\"(agemis@netuup.com)
+.TH UPDATE-MODULES 8 "Debian GNU/Outils Linux" "DEBIAN"
+.SH NOM
+update\-modules \- (re)fabrique /etc/modules.conf et /etc/chandev.conf
+.SH SYNOPSIS
+.B update\-modules
+[force]
+.SH DESCRIPTION
+.B update\-modules
+est un outil simple permettant de fabriquer les fichiers
+.IR /etc/modules.conf
+et
+.IR /etc/chandev.conf
+pour la plate-forme s390.
+Les outils de gestion des modules Linux utilisent un seul fichier de
+configuration pour configurer tous les modules. Au sein de ce fichier,
+un paquet peut difficilement configurer dynamiquement ses propres
+modules.
+.B update\-modules
+permet de rendre cette manipulation plus aisée.
+.PP
+.B update-modules
+tente de résoudre le problème en fabriquant le fichier de configuration
+à partir de fichiers distincts, situés dans le répertoire
+.IR /etc/modutils .
+Tous les fichiers de ce répertoire sont assemblés pour former
+.IR /etc/modules.conf
+et
+.IR /etc/chandev.conf .
+Il y a aussi le répertoire spécial
+.RI ( /etc/modutils/arch )
+contenant des informations dédiées aux plates-formes particulières.
+.B update-modules
+détermine la plate-forme et choisit le fichier à utiliser.
+.PP
+Après sa fabrication, l'ancien fichier de configuration
+est copié dans le fichier
+.IR /etc/modules.conf.old
+ou bien dans le fichier
+.IR /etc/chandev.conf.old .
+.SH "FICHIERS"
+Vous pouvez placer deux sortes de fichiers dans
+.IR /etc/modutils ,
+les fichiers normaux et les fichiers exécutables. Les fichiers normaux contiennent
+la configuration des modules standard et utilisent une syntaxe identique à
+celle de
+.BR modules.conf (5).
+Les fichiers d'extension .chandev contiennent les paramètres des modules et
+utilisent la même syntaxe que celle de
+.BR chandev (8).
+Le fichier spécial 0chandev.chandev contient les options des canaux de la couche
+périphérique.
+Les fichiers exécutables sont lancés et leur sortie est utilisée en tant
+qu'information de configuration complémentaire. Les messages d'erreurs envoyés
+sur la sortie d'erreur standard ne sont pas redirigés.
+.PP
+.B update\-modules
+ignore les fichiers correspondant à l'expression rationnelle suivante\ :
+.RS
+.B *\e(\e.dpkg\-[a\-z]*\e|~\e)$
+.RE
+(par exemple les fichiers d'extensions
+.IR .dpkg\-new ,
+.IR .dpkg\-orig ,
+.IR .dpkg\-dist ,
+.IR .dpkg\-old ,
+ou ceux dont le nom se termine par
+.IR ~ ).
+.SH OPTIONS
+.TP
+.I force
+.B update\-modules
+vérifie qu'il a bien fabriqué les fichiers actuels
+.IR "/etc/modules.conf "et
+.IR /etc/chandev.conf
+, en s'assurant de la présence d'un marqueur
+particulier sur la première ligne. Si le marqueur n'est pas présent, la
+fabrication est abandonnée. En fournissant le paramètre
+.I force
+, seul un avertissement est affiché.
+.SH "VOIR AUSSI"
+.BR depmod (1)
+.BR modules.conf (5)
+.BR modprobe (8)
+.BR chandev (8),
+.SH BOGUES
+Aucun bien sûr\ ! :)
+.SH AUTEUR
+Cette page de manuel a été écrite par Wichert Akkerman <wakkerma@debian.org>
+pour Debian GNU/Linux.
+.SH TRADUCTION
+Antoine Gémis <agemis@netuup.com>.
diff -Nru modutils-2.4.26.old/debian/update-modules.pt_BR.8 modutils-2.4.26/debian/update-modules.pt_BR.8
--- modutils-2.4.26.old/debian/update-modules.pt_BR.8 1970-01-01 01:00:00.000000000 +0100
+++ modutils-2.4.26/debian/update-modules.pt_BR.8 2004-10-22 16:52:25.000000000 +0200
@@ -0,0 +1,88 @@
+.TH UPDATE-MODULES 8 "Debian GNU/Outils Linux" "DEBIAN"
+.SH NOME
+update\-modules \- gera novamente o /etc/modules.conf e o /etc/chandev.conf
+.SH RESUMO
+.B update\-modules
+[force]
+.SH DESCRIÇÃO
+.B update\-modules
+é uma ferramenta simple para gerência dos arquivos
+.IR /etc/modules.conf
+e
+.IR /etc/chandev.conf
+para a arquitetura s390.
+Os utilitários de gerência de módulos Linux usam um arquivo
+de configuração para todas suas configurações. Isso torna difícil que
+pacotes adicionem dinamicamente informações sobre seus próprios módulos.
+Então o
+.B update\-modules
+foi criado para resolver este problema.
+.PP
+.B update-modules
+tenta resolver esse problema criando o arquivo de configuração a partir
+dos arquivos localizados em
+.IR /etc/modutils .
+Todos arquivos neste diretório são agrupados para gerar o
+.IR /etc/modules.conf
+e o
+.IR /etc/chandev.conf .
+Também existe um subdiretório especial
+.RI ( /etc/modutils/arch )
+contendo informações para arquiteturas especiais.
+.B update-modules
+determina a arquitetura e seleciona o arquivo a ser usado.
+.PP
+Depois de gerar os novos arquivos de configuração, uma cópia de backup
+será criada em
+.IR /etc/modules.conf.old
+ou
+.IR /etc/chandev.conf.old .
+.SH "ARQUIVOS"
+Existem dois tipos de arquivos que você pode colocar no diretório
+.IR /etc/modutils ,
+arquivos normais e arquivos executáveis. Arquivos normais contém
+informações padrão da configuração dos módulos, como descrito em
+.BR modules.conf (5).
+Os arquivos com extensão .chandev contém as opções do módulo, como descrito em
+.BR chandev (8).
+O arquivo especial 0chandev.chandev contém opções de canais da camada de
+dispositivos.
+Arquivos executáveis são executados e a saída é usada como informação extra de
+configuração. Mensagens de erro enviadas ao stderr não são redirecionadas.
+.PP
+.B update\-modules
+ignora arquivos que estão compatíveis com a seguinte expressão regular:
+.RS
+.B *\e(\e.dpkg\-[a\-z]*\e|~\e)$
+.RE
+(por exemplo os arquivos com a extensão
+.IR .dpkg\-new ,
+.IR .dpkg\-orig ,
+.IR .dpkg\-dist ,
+.IR .dpkg\-old ,
+ou terminados com
+.IR ~ ).
+.SH OPÇÕES
+.TP
+.I force
+.B update\-modules
+verifica se os arquivos
+.IR "/etc/modules.conf " e
+.IR /etc/chandev.conf
+atuais foram gerados por ele
+buscando por uma tag especial na primeira linha. Se a tag
+não for encontrada a criação dos arquivos será abortada. Fornecendo
+.I force
+como parâmetro somente um aviso é impresso na tela.
+.SH "VEJA TAMBÉM"
+.BR depmod (1)
+.BR modules.conf (5)
+.BR modprobe (8)
+.BR chandev (8),
+.SH BOGUES
+Nenhum é claro! :)
+.SH AUTOR
+Esta página de manual foi escrita por Wichert Akkerman <wakkerma@debian.org>
+para o Debian GNU/Linux.
+.SH TRADUÇÃO
+Philipe Gaspar <philipegaspar@terra.com.br>, 2003
diff -Nru modutils-2.4.26.old/util/alias.h modutils-2.4.26/util/alias.h
--- modutils-2.4.26.old/util/alias.h 2004-09-25 18:47:08.000000000 +0200
+++ modutils-2.4.26/util/alias.h 2004-09-25 19:57:29.000000000 +0200
@@ -52,7 +52,11 @@
"binfmt--310 binfmt_java",
"block-major-1 rd",
+#if defined(__s390__) || defined(__s390x__) || defined(__ia64__) || defined(__powerpc__)
+ "block-major-2 off",
+#else
"block-major-2 floppy",
+#endif
"block-major-3 ide-probe-mod",
"block-major-7 loop",
"block-major-8 sd_mod",
@@ -108,6 +112,7 @@
/* /dev/sunmouse Sun mouse */
/* /dev/beep Fancy beep device */
/* /dev/modreq Kernel module load request */
+ "char-major-10-116 snd",
"char-major-10-130 wdt", /* /dev/watchdog Watchdog timer port */
"char-major-10-131 wdt", /* /dev/temperature Machine internal temperature */
/* /dev/hwtrap Hardware fault trap */
@@ -117,7 +122,11 @@
"char-major-10-144 nvram", /* from Tigran Aivazian <tigran@sco.COM> */
"char-major-10-157 applicom", /* from David Woodhouse <dwmw2@infradead.org> */
"char-major-10-175 agpgart", /* /dev/agpgart GART AGP mapping access */
+ "char-major-10-181 toshiba",
+ "char-major-10-183 hw_random",
"char-major-10-184 microcode", /* Tigran Aivazian <tigran@veritas.com> */
+ "char-major-10-187 irnet",
+ "char-major-10-189 ussp",
"char-major-10-200 tun", /* Universal TUN/TAP device driver */
"char-major-10-250 hci_vhci",
@@ -153,6 +162,21 @@
"char-major-206 osst", /* OnStream SCSI tape */
"char-major-216 rfcomm",
+ /* agpgart like 2.6 */
+ "ali-agp agpgart",
+ "ati-agp agpgart",
+ "amd-k7-agp agpgart",
+ "amd64-agp agpgart",
+ "alpha-agp agpgart",
+ "hp-agp agpgart",
+ "i460-agp agpgart",
+ "intel-agp agpgart",
+ "nvidia-agp agpgart",
+ "sis-agp agpgart",
+ "sworks-agp agpgart",
+ "uninorth-agp agpgart",
+ "via-agp agpgart",
+
"dos msdos",
"dummy0 dummy",
"dummy1 dummy",
@@ -179,6 +203,11 @@
/* next two from <dairiki@matthews.dairiki.org> Thanks! */
"net-pf-17 af_packet",
"net-pf-19 off", /* acorn econet */
+ "net-pf-20 atm",
+ "net-pf-23 irda",
+ "net-pf-24 pppoe",
+ "net-pf-25 wanrouter",
+ "net-pf-26 llc",
"net-pf-31 bluez",
@@ -199,6 +228,10 @@
"bt-proto-2 sco",
"bt-proto-3 rfcomm",
"bt-proto-4 bnep",
+ "bt-proto-5 cmtp",
+ "bt-proto-6 hidp",
+ "bt-proto-7 avdtp",
+
"plip0 plip",
"plip1 plip",
@@ -228,6 +261,7 @@
"ppp-compress-21 bsd_comp",
"ppp-compress-24 ppp_deflate",
"ppp-compress-26 ppp_deflate",
+ "ppp ppp_async", /* for 2.4 */
#ifndef __sparc__
"parport_lowlevel parport_pc",
Attachment:
signature.asc
Description: Digital signature