--- hotplug-0.0.20040329.orig/extra/scsi.rc +++ hotplug-0.0.20040329/extra/scsi.rc @@ -0,0 +1,40 @@ +#!/bin/sh -e +# +# scsi.rc loads the modules for SCSI devices at boot time, if needed +# it requires a 2.6 kernel +# +# Copyright (C) Canonical Software Ltd. 2004 +# Written by Jeff Bailey +# + +# only 2.6 kernels are supported +[ -d /sys/block/ ] || exit 0 + +cd /etc/hotplug +. ./hotplug.functions + +scsi_boot_events() { + export ACTION DEVPATH + + [ "$(echo /sys/bus/scsi/devices/*)" = "/sys/bus/scsi/devices/*" ] && return + + ACTION=add + for device in /sys/bus/scsi/devices/*; do + DEVPATH=${device#/sys} + ./scsi.agent + done +} + +# See how we were called. +case "$1" in + start|restart) + scsi_boot_events + ;; + stop) + ;; + status) + ;; + *) + echo "Usage: $0 {start|stop|status|restart}" + exit 1 +esac --- hotplug-0.0.20040329.orig/extra/isapnp.rc +++ hotplug-0.0.20040329/extra/isapnp.rc @@ -0,0 +1,73 @@ +#!/bin/sh -e +# +# isapnp.rc synthesizes isapnp hotplug events at boot time +# it requires a 2.6 kernel with CONFIG_ISAPNP defined +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# Copyright (C) 2004 Simone Gotti +# Copyright (C) 2004 Marco d'Itri +# + +# only 2.6 kernels are supported +[ -d /sys/bus/pnp/devices/ ] || exit 0 + +cd /etc/hotplug +. ./hotplug.functions + +isapnp_boot_events() +{ + if [ "$(echo /sys/bus/pnp/devices/*/id)" = "/sys/bus/pnp/devices/*/id" ]; + then + return 0 + fi + + cat /sys/bus/pnp/devices/*/id \ + | while read PNPID; do + # get the name of the module which should be loaded + MODULE=$(modprobe --show-depends -q pnp:d$PNPID \ + | sed -e '$!d;s/.*\/\(.*\)\.ko .*/\1/') + + case "$MODULE" in + "") # continue if there is no alias available + continue + ;; + install*) # skip the blacklist check if install is used + MODULE="pnp:d$PNPID" + ;; + *) # ignore blacklisted devices + if is_blacklisted $MODULE; then + mesg " $MODULE: blacklisted" + continue + fi + ;; + esac + + # see do_pnp_entry() in /usr/src/linux/scripts/file2alias.c + if $MODPROBE -q $MODULE; then + mesg " $MODULE: loaded sucessfully" + else + mesg " $MODULE: can't be loaded" + fi + done +} + +# See how we were called. +case "$1" in + start|restart) + isapnp_boot_events + ;; + stop) + # echo "isapnp stop -- ignored" + ;; + status) + # echo "isapnp status -- ignored" + ;; + *) + echo "Usage: $0 {start|stop|status|restart}" + exit 1 +esac + --- hotplug-0.0.20040329.orig/extra/isapnp.aliases +++ hotplug-0.0.20040329/extra/isapnp.aliases @@ -0,0 +1,12 @@ +# These aliases are used by /etc/hotplug/isapnp.rc and are needed here +# because the modules themselves are not providing them. +alias pnp:dPNP0400 parport_pc +alias pnp:dPNP0401 parport_pc +alias pnp:dPNP0510 irtty-sir +alias pnp:dPNP0511 irtty-sir +alias pnp:dPNP0700 floppy +alias pnp:dPNP0800 pcspkr +alias pnp:dPNP0b00 rtc +alias pnp:dPNP0303 atkbd +alias pnp:dPNP0f13 psmouse +alias pnp:dPNPb02f analog --- hotplug-0.0.20040329.orig/extra/ide.rc +++ hotplug-0.0.20040329/extra/ide.rc @@ -0,0 +1,55 @@ +#!/bin/sh -e +# +# ide.rc loads the modules for IDE devices at boot time, if needed +# it requires a 2.6 kernel +# +# Copyright (C) 2004, 2005 Marco d'Itri +# + +# only 2.6 kernels are supported +[ -d /sys/block/ ] || exit 0 + +cd /etc/hotplug +. ./hotplug.functions + +ide_boot_events() { + [ "$(echo /proc/ide/*/media)" = "/proc/ide/*/media" ] && return + + for drive in /proc/ide/*/media; do + # nothing to do if the device has already been took in charge + unit=${drive#/proc/ide/}; unit=${unit%/media} + [ -d /sys/block/$unit ] && continue + + read media < $drive + case "$media" in + disk) MODULE=ide-disk ;; + cdrom) MODULE=ide-cd ;; + tape) MODULE=ide-tape ;; + floppy) MODULE=ide-floppy ;; + *) MODULE=ide-generic ;; + esac + + if is_blacklisted $MODULE; then + mesg " $MODULE: blacklisted" + elif modprobe --quiet $MODULE; then + mesg " $MODULE: loaded sucessfully" + else + mesg " $MODULE: can't be loaded" + fi + done +} + +# See how we were called. +case "$1" in + start|restart) + ide_boot_events + ;; + stop) + ;; + status) + ;; + *) + echo "Usage: $0 {start|stop|status|restart}" + exit 1 +esac + --- hotplug-0.0.20040329.orig/extra/README.modules +++ hotplug-0.0.20040329/extra/README.modules @@ -0,0 +1,78 @@ +This file describes which modules can be automatically loaded at boot time +with Hotplug and what to do with the ones which cannot be loaded by Hotplug. + +The following classes of modules will be loaded automatically by the 2.6 +kernel itself or the hotplug initscript: + +* The modules that directly correspond to some ISAPNP, PCI or USB hardware + will be loaded by hotplug initscript. Such modules are called "detectable" + below. To verify if the module is detectable, check for the presence of the + MODULE_DEVICE_TABLE macro in its source code. If you don't have enough skills + to do that, there is another way. Compile and install the modules. Find the + compiled module in the /lib/modules/`uname -r` directory. + Execute the following command: + + modinfo /path/to/this/module.ko + + If you see an alias that begins with "pci:" or "usb:", then the module + is detectable. For example, the snd-fm801.ko module is detectable because it + has a "pci:v00001319d00000801sv*sd*bc04sc01i*" alias. + +* The modules that are listed in the modinfo output as dependencies of + detectable modules will be loaded automatically by hotplug scripts. For + example, the detectable snd-fm801.ko module depends upon snd-pcm, + snd-opl3-lib, snd-mpu401-uart, snd and snd-tea575x-tuner modules. They will + be loaded automatically by Hotplug if a ForteMedia-based soundcard is + present in the system. + +* Filesystem modules (e.g., vfat.ko), NLS character sets (e.g., nls-koi8-r.ko) + and most network protocol drivers (e.g., ipv6.ko) are loaded automatically + by the kernel upon the first need. + +* Character and block device drivers are loaded automatically even without the + Hotplug package installed when an application opens the existing device node + without a loaded driver. This is controlled by the aliases in + /lib/modules/`uname -r`/modules.alias (generated automatically) and + /etc/modprobe.conf (created manually) files that begin with char-major and + block-major. However, this relies upon the device node being already present + even when the module is not loaded, and this is not the case with Udev. For + example, the following modules can be loaded automatically on first demand + when Udev is not used: lp, ppp-generic. They will not be loaded + automatically when Udev is used. + +* Devfsd also can load modules on demand. However, since devfs is deprecated, + this is not covered here. + +* Almost everything else is not loaded automatically. For example, the + following modules will not be loaded automatically: ide-cd, snd-pcm-oss + +There are several solutions for using such undetectable drivers: + +* Compile them directly into the kernel, not as modules. If you seem to be + unable to do this, it's because you selected some dependency of such a + driver as a module. + +* Use a distribution-provided script to load these modules at boot time + unconditionally. On Debian systems, it's sufficient to put their names in + the /etc/modules file. + +* Add a line to the /etc/modprobe.conf file that tells module-init-tools about + a "missed dependency" between modules, e.g.: + + install snd-pcm modprobe -i snd-pcm ; modprobe snd-pcm-oss ; true + + This way, the OSS compatibility module will be loaded automatically for + all PCI soundcards supported by ALSA. Note, however, that this solution + depends upon snd-pcm.ko being a module. More examples of such + "dependencies" are shown below: + + install snd-seq modprobe -i snd-seq ; modprobe snd-seq-oss ; true + install parport modprobe -i parport ; modprobe lp ; modprobe ppdev ; true + install mptbase modprobe -i mptbase ; modprobe mptscsih ; modprobe mptctl ; modprobe mptlan ; true + install usb-storage modprobe -i usb-storage ; modprobe sd-mod ; true + + As you can see, some detectable module or its dependency is put on the + left, and its undetectable helpers are enumerated then. Note however that + this approach doesn't help you to load modules like nbd.ko that don't depend + upon any hardware at all. + --- hotplug-0.0.20040329.orig/extra/net.rc +++ hotplug-0.0.20040329/extra/net.rc @@ -0,0 +1,63 @@ +#!/bin/sh +# vim: syntax=sh +# +# net.rc recover lost boot-time network hotplug events; +# this deals with the case where network drivers +# are statically linked or loaded before hotplug +# (e.g. by initramfs) but marked as hotplug in +# /etc/network/interfaces + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +cd /etc/hotplug +. ./hotplug.functions + +net_boot_events () +{ + # make sure the net agent will run + ACTION=add + export ACTION INTERFACE + + if [ -d /sys/class/net ]; then + # 2.6 kernels + for NET_DEVICE in /sys/class/net/*; do + INTERFACE=`basename $NET_DEVICE` + ./net.agent + done + fi + + return 0 +} + +# See how we were called. +case "$1" in + start) + rm -f /etc/hotplug/.run/net.busy + net_boot_events + ;; + stop) + # echo "net stop -- ignored" + ;; + status) + echo "NET Status for kernel: " `uname -srm` + echo '' + + if [ -d /sys/class/net ]; then + echo "NET devices:" + for NET_DEVICE in /sys/class/net/*; do + echo " "`basename $NET_DEVICE` + done + else + echo "no /sys/class/net support?" + fi + echo '' + + ;; + restart) + # always invoke by absolute path, else PATH=$PATH: + $0 stop && $0 start + ;; + *) + echo "Usage: $0 {start|stop|status|restart}" + exit 1 +esac --- hotplug-0.0.20040329.orig/debian/po/templates.pot +++ hotplug-0.0.20040329/debian/po/templates.pot @@ -0,0 +1,90 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-27 01:31+0900\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "Do you use USB mouse with X11?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "" +"If you need to use a USB mouse with X, the X server needs to be able to open " +"\"/dev/input/mice\" on startup. That means you can't normally hotplug a " +"mouse you plan to use with X; it needs some modules preloaded. However, " +"hotplug has a hack to let this work, which you can turn on here if you " +"anticipate using a USB mouse." +msgstr "" + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Which USB modules do you want to be preloaded?" +msgstr "" + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Before running hotplug support, you can preload some USB modules." +msgstr "" + +#. Type: select +#. Description +#: ../templates:22 +msgid "Which network interfaces do you want to be managed by hotplug?" +msgstr "" + +#. Type: select +#. Description +#: ../templates:22 +msgid "" +"When a network interface appears in the system, hotplug will detect it and " +"try to up it by using ifup. You can select hot-pluggable network " +"interfaces:\n" +" all: all network interfaces in /etc/network/interfaces.\n" +" auto: network interfaces marked as 'auto' in /etc/network/interfaces.\n" +" non-'auto' network interfaces will be ignored.\n" +" hotplug: selected network interfaces by 'mapping hotplug' stanzas\n" +" in /etc/network/interfaces. In this case, hotplug will bring up\n" +" the network interface with logical interface name\n" +" (e.g. ifup eth0=hotplug)." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "Do you want to ignore PCI display devices?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "" +"By default, hotplug ignores PCI display devices, so device drivers won't be " +"loaded automatically." +msgstr "" --- hotplug-0.0.20040329.orig/debian/po/ca.po +++ hotplug-0.0.20040329/debian/po/ca.po @@ -0,0 +1,130 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-27 01:31+0900\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "Do you use USB mouse with X11?" +msgstr "Useu un ratol USB amb X11?" + +#. Type: boolean +#. Description +#: ../templates:4 +#, fuzzy +msgid "" +"If you need to use a USB mouse with X, the X server needs to be able to open " +"\"/dev/input/mice\" on startup. That means you can't normally hotplug a " +"mouse you plan to use with X; it needs some modules preloaded. However, " +"hotplug has a hack to let this work, which you can turn on here if you " +"anticipate using a USB mouse." +msgstr "" +"Si necessiteu usar un ratol USB amb X11, es necessita habilitar al servidor " +"de X per a obrir \"/dev/input/mice\". Aix voldr dir que no podreu " +"connectar en calent un ratol que penseu fer servir amb X11; aix " +"necessitaria de la precrrega d'alguns mduls. Si no els heu compilat en el " +"vostre nucli, digueu Yes (Si). (X11_USBMICE_HACK=true)" + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Which USB modules do you want to be preloaded?" +msgstr "Quins mduls USB desitgeu precarregar?" + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Before running hotplug support, you can preload some USB modules." +msgstr "Abans d'executar el suport hotplug, podeu carregar alguns mduls USB." + +#. Type: select +#. Description +#: ../templates:22 +msgid "Which network interfaces do you want to be managed by hotplug?" +msgstr "" + +#. Type: select +#. Description +#: ../templates:22 +msgid "" +"When a network interface appears in the system, hotplug will detect it and " +"try to up it by using ifup. You can select hot-pluggable network " +"interfaces:\n" +" all: all network interfaces in /etc/network/interfaces.\n" +" auto: network interfaces marked as 'auto' in /etc/network/interfaces.\n" +" non-'auto' network interfaces will be ignored.\n" +" hotplug: selected network interfaces by 'mapping hotplug' stanzas\n" +" in /etc/network/interfaces. In this case, hotplug will bring up\n" +" the network interface with logical interface name\n" +" (e.g. ifup eth0=hotplug)." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "Do you want to ignore PCI display devices?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "" +"By default, hotplug ignores PCI display devices, so device drivers won't be " +"loaded automatically." +msgstr "" + +#~ msgid "USB keyboard configuration" +#~ msgstr "Configuraci del teclat USB" + +#~ msgid "" +#~ "If you're booting with a USB keyboard and/or mouse, and want to defend " +#~ "against boot failures like missing modules, you should probably use " +#~ "static linking for the \"hid\", \"keybdev\" (and/or \"mousedev\"), \"input" +#~ "\", \"usbcore\", and USB Host Controller modules." +#~ msgstr "" +#~ "Si esteu arrencant amb un teclat i / o ratol USB i desitgeu protegir-vos " +#~ "de possibles errades durant l'arrencada, aix com de la falla dels " +#~ "mduls, probablement haureu d'usar la connexi esttica per als mduls " +#~ "\"hid\", \"keybdev\" (i / o \"mousedev\"), \"input\", \"usbcore\" i un " +#~ "per a la USB Host Controller (N. del T. s la controladora USB del vostre " +#~ "maquinari)." + +#~ msgid "Do you use USB with hotplugging?" +#~ msgstr "Useu el USB junt amb la connexi en calent?" + +#, fuzzy +#~ msgid "" +#~ "By default, hotplug will load appropriate USB modules automatically if " +#~ "USB device is plugged in. If you want to you can choose to turn this " +#~ "behavior off, which will set USBD_ENABLE=false in /etc/default/hotplug. " +#~ "You may also prevent all hotplugging with the kernel CONFIG_HOTPLUG " +#~ "option, or by putting an empty pathname in /proc/sys/kernel/hotplug." +#~ msgstr "" +#~ "El hotplug carrega automticament els mduls USB apropiats si el " +#~ "dispositiu USB s connectat. Per, si aneu a usar el USB per no la " +#~ "connexi en calent USB, llabors establiu el segent en /etc/default/" +#~ "hotplug.usb: USBD_ENABLE=false Tamb podeu evitar qualsevol connexi en " +#~ "calent amb l'opci del nucli CONFIG_HOTPLUG o deixant buida l'entrada del " +#~ "nom de la en /proc/sys/kernel/hotplug." --- hotplug-0.0.20040329.orig/debian/po/da.po +++ hotplug-0.0.20040329/debian/po/da.po @@ -0,0 +1,131 @@ +# translation of da.po to Danish +# translation of hotplug Debian templates to Danish +# Claus Hindsgaul , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: da\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-27 01:31+0900\n" +"PO-Revision-Date: 2004-07-06 14:18+0200\n" +"Last-Translator: Claus Hindsgaul \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.3.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "Do you use USB mouse with X11?" +msgstr "Vil du bruge USB-mus under X11?" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "" +"If you need to use a USB mouse with X, the X server needs to be able to open " +"\"/dev/input/mice\" on startup. That means you can't normally hotplug a " +"mouse you plan to use with X; it needs some modules preloaded. However, " +"hotplug has a hack to let this work, which you can turn on here if you " +"anticipate using a USB mouse." +msgstr "" +"Hvis du skal bruge en USB-mus med X, skal X-serveren kunne åbne enheden \"/" +"dev/input/mice\" under opstarten. Det betyder at du normalt ikke kan " +"tilslutte en mus dynamisk, hvis du ønsker at bruge den med X, da dette " +"kræver at bestemte moduler bliver indlæst på forhånd. Hotplug kan dog en " +"måde at omgå dette, som du kan slå til her, hvis du regner med at bruge en " +"USB-mus." + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Which USB modules do you want to be preloaded?" +msgstr "Hvilke USB-moduler skal indlæses på forhånd?" + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Before running hotplug support, you can preload some USB modules." +msgstr "Du kan indlæse nogle moduler før hotplug-understøttelsen køres." + +#. Type: select +#. Description +#: ../templates:22 +msgid "Which network interfaces do you want to be managed by hotplug?" +msgstr "Hvilke netkort ønsker du at hotplug skal håndtere?" + +#. Type: select +#. Description +#: ../templates:22 +msgid "" +"When a network interface appears in the system, hotplug will detect it and " +"try to up it by using ifup. You can select hot-pluggable network " +"interfaces:\n" +" all: all network interfaces in /etc/network/interfaces.\n" +" auto: network interfaces marked as 'auto' in /etc/network/interfaces.\n" +" non-'auto' network interfaces will be ignored.\n" +" hotplug: selected network interfaces by 'mapping hotplug' stanzas\n" +" in /etc/network/interfaces. In this case, hotplug will bring up\n" +" the network interface with logical interface name\n" +" (e.g. ifup eth0=hotplug)." +msgstr "" +"Når der dukker et netkort op på systemet, vil hotplug finde det og forsøge " +"at åbne forbindelse gennem det med ifup. Du kan vælge de netkort, der kan " +"indsættes under drift:\n" +" alle: Alle netkort i /etc/network/interfaces.\n" +" auto: netkort markeret som 'auto' i /etc/network/interfaces.\n" +" ikke-'auto' netkort ignoreres.\n" +" hotplug: netkort udvalgt med 'mapping hotplug'-linjer i\n" +" /etc/network/interfaces. I dette tilfælde vil hotplug oprette\n" +" forbindelsen for det netkort, med logisk netkort-navn\n" +" (f.eks. ifup eth0=hotplug)." + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "Do you want to ignore PCI display devices?" +msgstr "Ønsker du at ignorere PCI-skærmkort?" + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "" +"By default, hotplug ignores PCI display devices, so device drivers won't be " +"loaded automatically." +msgstr "" +"Som udgangspunkt ignorerer hotplug PCI-skærmkort, så enhedsdriverne ikke " +"indlæses automatisk." + +#~ msgid "USB keyboard configuration" +#~ msgstr "Opsætning af USB-tastatur" + +#~ msgid "" +#~ "If you're booting with a USB keyboard and/or mouse, and want to defend " +#~ "against boot failures like missing modules, you should probably use " +#~ "static linking for the \"hid\", \"keybdev\" (and/or \"mousedev\"), \"input" +#~ "\", \"usbcore\", and USB Host Controller modules." +#~ msgstr "" +#~ "Hvis du starter computeren op med et USB-tastatur og/eller -mus, og vil " +#~ "beskyttes med fejl under opstarten såsom manglende moduler, bør du bruge " +#~ "statisk lænkning til modulerne \"hid\", \"keybdev\" (og/eller \"mousedev" +#~ "\"), \"input\", \"usbcore\" samt USB-værtens moduler." + +#~ msgid "Do you use USB with hotplugging?" +#~ msgstr "Vil du bruge USB med dynamisk tilslutning?" + +#~ msgid "" +#~ "By default, hotplug will load appropriate USB modules automatically if " +#~ "USB device is plugged in. If you want to you can choose to turn this " +#~ "behavior off, which will set USBD_ENABLE=false in /etc/default/hotplug. " +#~ "You may also prevent all hotplugging with the kernel CONFIG_HOTPLUG " +#~ "option, or by putting an empty pathname in /proc/sys/kernel/hotplug." +#~ msgstr "" +#~ "Som udgangspunkt vil hotplug indlæse de relevante USB-moduler automatisk, " +#~ "hvis en USB-enhed bliver tilsluttet. Hvis du ønsker det, kan du vælge at " +#~ "slå denne funktion fra, hvilket vil sætte USBD_ENABLE=false in filen /etc/" +#~ "default/hotplug. Du kan også undgå alle dynamiske tilslutninger med kerne-" +#~ "tilvalget CONFIG_HOTPLUG, eller ved at placere et tomt stinavn i /proc/" +#~ "sys/kernel/hotplug." --- hotplug-0.0.20040329.orig/debian/po/de.po +++ hotplug-0.0.20040329/debian/po/de.po @@ -0,0 +1,116 @@ +# translation of de.po to German +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# Jens Nachtigall , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: de\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-09-04 02:08+0900\n" +"PO-Revision-Date: 2004-12-04 21:48+0100\n" +"Last-Translator: Jens Nachtigall \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.3.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "Do you use USB mouse with X11?" +msgstr "Soll eine USB-Maus mit X11 benutzt werden?" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "" +"If you need to use a USB mouse with X, the X server needs to be able to open " +"\"/dev/input/mice\" on startup. That means you can't normally hotplug a " +"mouse you plan to use with X; it needs some modules preloaded. However, " +"hotplug has a hack to let this work, which you can turn on here if you " +"anticipate using a USB mouse." +msgstr "" +"Wenn Sie eine USB-Maus mit X11 benutzen wollen, dann muss der X-Server die " +"Gerätedatei »/dev/input/mice« beim Starten öffnen können. Dies bedeutet, " +"dass Sie die Maus während des Betriebs nicht einfach einstecken können. " +"Dazu müssen einige besondere Module vorab geladen werden. Mittels eines " +"speziellen Tricks kann hotplug Ihnen dies jedoch dennoch erlauben. " +"Sofern Sie vorhaben eine USB-Maus zu benutzen, sollten Sie hier " +"zustimmen." + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Which USB modules do you want to be preloaded?" +msgstr "Welche USB-Module sollen automatisch geladen werden?" + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Before running hotplug support, you can preload some USB modules." +msgstr "" +"Bevor Sie Hot-Plugging (also das Anschließen oder Entfernen von Geräten " +"im laufenden Betrieb) nutzen können, müssen einige USB-Module geladen " +"werden." + +#. Type: select +#. Description +#: ../templates:22 +msgid "Which network interfaces do you want to be managed by hotplug?" +msgstr "Welche Netzwerk-Schnittstellen sollen von hotplug verwaltet werden?" + +#. Type: select +#. Description +#: ../templates:22 +msgid "" +"When a network interface appears in the system, hotplug will detect it and " +"try to up it by using ifup. You can select hot-pluggable network " +"interfaces:\n" +" all: all network interfaces in /etc/network/interfaces.\n" +" auto: network interfaces marked as 'auto' in /etc/network/interfaces.\n" +" non-'auto' network interfaces will be ignored.\n" +" hotplug: selected network interfaces by 'mapping hotplug' stanzas\n" +" in /etc/network/interfaces. In this case, hotplug will bring up\n" +" the network interface with logical interface name\n" +" (e.g. ifup eth0=hotplug)." +msgstr "" +"Sobald eine Netzwerk-Schnittstelle im System erscheint, wird hotplug diese " +"erkennen und mit »ifup« automatisch einrichten. Hier können Sie wählen, welche " +"Netzwerk-Schnittstellen hotplug-fähig sind:\n" +" all: alle in /etc/network/interfaces aufgelisteten\n" +" Netzwerk-Schnittstellen\n" +" auto: Netzwerk-Schnittstellen, die in /etc/network/interfaces mit\n" +" »auto« markiert wurden\n" +" Netzwerk-Schnittstellen ohne das Wort »auto« werden ignoriert\n" +" hotplug: Netzwerk-Schnittstellen werden durch »mapping hotplug«-Absätze\n" +" in /etc/network/interfaces ausgewählt. In diesem Fall richtet\n" +" hotplug die Netzwerk-Schnittstellen über ihren logischen\n" +" Schnittstellen-Namen ein (z.B. ifup eth0=hotplug)." + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "Do you want to ignore PCI display devices?" +msgstr "Sollen PCI-Display-Geräte ignoriert werden?" + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "" +"By default, hotplug ignores PCI display devices, so device drivers won't be " +"loaded automatically." +msgstr "" +"Standardmäßig ignoriert hotplug PCI-Display-Geräte, so dass deren " +"Gerätetreiber nicht automatisch geladen wird." + --- hotplug-0.0.20040329.orig/debian/po/cs.po +++ hotplug-0.0.20040329/debian/po/cs.po @@ -0,0 +1,121 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: hotplug\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-27 01:31+0900\n" +"PO-Revision-Date: 2004-07-20 12:00+0200\n" +"Last-Translator: Jan Outrata \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "Do you use USB mouse with X11?" +msgstr "Pouvte USB my v X11?" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "" +"If you need to use a USB mouse with X, the X server needs to be able to open " +"\"/dev/input/mice\" on startup. That means you can't normally hotplug a " +"mouse you plan to use with X; it needs some modules preloaded. However, " +"hotplug has a hack to let this work, which you can turn on here if you " +"anticipate using a USB mouse." +msgstr "" +"Pokud muste pouvat USB my v X, mus bt X server schopen pi startu " +"otevt \"/dev/input/mice\". To znamen, e nemete obyejn za bhu " +"vymnit my, kterou chcete pouvat v X; ty potebuj mt pedem nahrny " +"njak moduly. Nicmn, hotplug toto um zprovoznit, a pokud se chystte USB " +"my pouvat, mete zde tuto podporu zapnout." + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Which USB modules do you want to be preloaded?" +msgstr "Kter USB moduly chcete nahrvat?" + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Before running hotplug support, you can preload some USB modules." +msgstr "Ped sputnm podpory hotplug mete nahrt njak USB moduly." + +#. Type: select +#. Description +#: ../templates:22 +msgid "Which network interfaces do you want to be managed by hotplug?" +msgstr "Kter sov rozhran maj bt ovldna pomoc hotplug?" + +#. Type: select +#. Description +#: ../templates:22 +msgid "" +"When a network interface appears in the system, hotplug will detect it and " +"try to up it by using ifup. You can select hot-pluggable network " +"interfaces:\n" +" all: all network interfaces in /etc/network/interfaces.\n" +" auto: network interfaces marked as 'auto' in /etc/network/interfaces.\n" +" non-'auto' network interfaces will be ignored.\n" +" hotplug: selected network interfaces by 'mapping hotplug' stanzas\n" +" in /etc/network/interfaces. In this case, hotplug will bring up\n" +" the network interface with logical interface name\n" +" (e.g. ifup eth0=hotplug)." +msgstr "" +"Kdy se v systmu objev sov rozhran, hotplug to zjist a pokus se jej " +"nahodit pomoc ifup. Vyberte za bhu vymniteln sov rozhran:\n" +" all: vechna sov rozhran v /etc/network/interfaces.\n" +" auto: sov rozhran oznaen v /etc/network/interfaces jako 'auto'.\n" +" ne-'auto' sov rozhran budou ignorovna.\n" +" hotplug: sov rozhran v /etc/network/interfaces vybran stmi\n" +" 'mapping hotplug'. V tomto ppad hotplug nahod sov rozhran\n" +" s tmto logickm jmnem (nap. ifup eth0=hotplug)." + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "Do you want to ignore PCI display devices?" +msgstr "Chcete ignorovat zobrazovac zazen na sbrnici PCI?" + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "" +"By default, hotplug ignores PCI display devices, so device drivers won't be " +"loaded automatically." +msgstr "" +"Pi vchozm nastaven ignoruje hotplug zobrazovac zazen na sbrnici " +"PCI, tud se ovladae tchto zazen nebudou nahrvat automaticky." + +#~ msgid "USB keyboard configuration" +#~ msgstr "Konfigurace USB klvesnice" + +#~ msgid "" +#~ "If you're booting with a USB keyboard and/or mouse, and want to defend " +#~ "against boot failures like missing modules, you should probably use " +#~ "static linking for the \"hid\", \"keybdev\" (and/or \"mousedev\"), \"input" +#~ "\", \"usbcore\", and USB Host Controller modules." +#~ msgstr "" +#~ "Pokud spoutte systm s USB klvesnic a/nebo my a chcete pedejt " +#~ "chybm jako chybjc moduly, mli byste pout statick linkovn pro " +#~ "moduly \"hid\", \"keybdev\" (a/nebo \"mousedev\"), \"input\", \"usbcore\" " +#~ "a USB Host Controller." + +#~ msgid "${usbmodules}" +#~ msgstr "${usbmodules}" --- hotplug-0.0.20040329.orig/debian/po/es.po +++ hotplug-0.0.20040329/debian/po/es.po @@ -0,0 +1,128 @@ +# +# hotplug debconf translation to Spanish +# Copyright (C) 2004 Software in the Public Interest +# This file is distributed under the same license as the hotplug debconf package. +# +# Changes: +# - Initial translation +# Javier Fernandez-Sanguino Pea , 2005 +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentacin de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traduccin al espaol, por favor, lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traduccin de Debian al espaol +# http://www.debian.org/intl/spanish/coordinacion +# especialmente las notas de traduccin en +# http://www.debian.org/intl/spanish/notas +# +# - La gua de traduccin de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: hotplug\n" +"Report-Msgid-Bugs-To: debian-l10n-spanish@lists.debian.org\n" +"POT-Creation-Date: 2004-10-27 01:31+0900\n" +"PO-Revision-Date: 2005-04-04 00:01+0200\n" +"Last-Translator: Javier Fernandez-Sanguino \n" +"Language-Team: Debian l10n spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "Do you use USB mouse with X11?" +msgstr "Usa un ratn USB en X11?" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "" +"If you need to use a USB mouse with X, the X server needs to be able to open " +"\"/dev/input/mice\" on startup. That means you can't normally hotplug a " +"mouse you plan to use with X; it needs some modules preloaded. However, " +"hotplug has a hack to let this work, which you can turn on here if you " +"anticipate using a USB mouse." +msgstr "Para usar un ratn USB en X el servidor X necesita abrir /dev/input/mice. Esto significa que no puede conectar en caliente un ratn para usarlo con X ya que es necesario que algunos mdulos estn cargados de antemano. Sin embargo, existe una forma de que hotplug lo haga funcionar, puede activarlo si piensa que va a utilizar un ratn USB." + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Which USB modules do you want to be preloaded?" +msgstr "Qu mdulos USB desea precargar?" + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Before running hotplug support, you can preload some USB modules." +msgstr "Antes de ejecutar hotplug, puede precargar algunos mdulos USB." + +#. Type: select +#. Description +#: ../templates:22 +msgid "Which network interfaces do you want to be managed by hotplug?" +msgstr "Indique las interfaces de red que desea que gestione hotplug" + +#. Type: select +#. Description +#: ../templates:22 +msgid "" +"When a network interface appears in the system, hotplug will detect it and " +"try to up it by using ifup. You can select hot-pluggable network " +"interfaces:\n" +" all: all network interfaces in /etc/network/interfaces.\n" +" auto: network interfaces marked as 'auto' in /etc/network/interfaces.\n" +" non-'auto' network interfaces will be ignored.\n" +" hotplug: selected network interfaces by 'mapping hotplug' stanzas\n" +" in /etc/network/interfaces. In this case, hotplug will bring up\n" +" the network interface with logical interface name\n" +" (e.g. ifup eth0=hotplug)." +msgstr "" +"Hotplug detectar la aparicin de una interfaz de red nueva en el sistema y la intentar levantar utilizando ifup. Puede seleccionar los interfaces de red que se gestionarn de esta manera:\n" +" todos: todos las interfaces de red en /etc/network/interfaces.\n" +" auto: las interfaces de red marcados con 'auto' en /etc/network/interfaces.\n" +" se ignorarn las interfaces que no tengan esa marca.\n" +" hotplug: seleccionar las interfaces de red en /etc/network/interfaces \n" +" que tengan asociaciones 'mapping hotplug'. En este caso hotplug\n" +" levantar la interfaz de red con un nombre de interfaz lgico.\n" +" (p. ej. ifup eth0=hotplug)." + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "Do you want to ignore PCI display devices?" +msgstr "Desea ignorar los dispositivos grficos PCI?" + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "" +"By default, hotplug ignores PCI display devices, so device drivers won't be " +"loaded automatically." +msgstr "Hotplug har caso omiso de forma predeterminada de los dispositivos grficos PCI de forma que no cargar automticamente controladores para stos." + +#~ msgid "USB keyboard configuration" +#~ msgstr "Configuracin del teclado USB" + +#~ msgid "" +#~ "If you're booting with a USB keyboard and/or mouse, and want to defend " +#~ "against boot failures like missing modules, you should probably use " +#~ "static linking for the \"hid\", \"keybdev\" (and/or \"mousedev\"), \"input" +#~ "\", \"usbcore\", and USB Host Controller modules." +#~ msgstr "" +#~ "Si arranca con un teclado y/o ratn USB y quiere evitar errores de " +#~ "arranque debidos a la falta de algn mdulo, probablemente debera " +#~ "enlazar estticamente \"hid\", \"keybdev\" (y/o \"mousedev\"), \"input\", " +#~ "\"usbcore\" y los mdulos USB Host Controller." + +#~ msgid "Do you use USB with hotplugging?" +#~ msgstr "Usa un ratn USB con hotplug?" --- hotplug-0.0.20040329.orig/debian/po/fr.po +++ hotplug-0.0.20040329/debian/po/fr.po @@ -0,0 +1,148 @@ +# translation of fr.po to French +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# Christian Perrier , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: hotplug 0.0.20030805-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-27 01:31+0900\n" +"PO-Revision-Date: 2004-07-05 07:22+0200\n" +"Last-Translator: Christian Perrier \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.3.1\n" +"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "Do you use USB mouse with X11?" +msgstr "Utilisez-vous une souris USB avec X11?" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "" +"If you need to use a USB mouse with X, the X server needs to be able to open " +"\"/dev/input/mice\" on startup. That means you can't normally hotplug a " +"mouse you plan to use with X; it needs some modules preloaded. However, " +"hotplug has a hack to let this work, which you can turn on here if you " +"anticipate using a USB mouse." +msgstr "" +"Si vous prvoyez d'utiliser une souris USB avec X11, le serveur X doit " +"pouvoir accder /dev/input/mice. Cela signifie que l'insertion chaud " +"d'une souris que vous prvoyez utiliser avec X11 n'est donc pas possible: " +"elle a en effet besoin du pr-chargement de certains modules. Hotplug " +"comporte cependant un contournement qui le permet malgr tout. Vous pouvez " +"l'activer ici afin d'anticiper l'utilisation d'une souris USB." + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Which USB modules do you want to be preloaded?" +msgstr "Modules USB pr-charger:" + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Before running hotplug support, you can preload some USB modules." +msgstr "" +"Avant de pouvoir lancer la gestion des insertions chaud, vous pouvez pr-" +"charger certains modules USB." + +#. Type: select +#. Description +#: ../templates:22 +msgid "Which network interfaces do you want to be managed by hotplug?" +msgstr "Interfaces rseau gres par hotplug :" + +#. Type: select +#. Description +#: ../templates:22 +msgid "" +"When a network interface appears in the system, hotplug will detect it and " +"try to up it by using ifup. You can select hot-pluggable network " +"interfaces:\n" +" all: all network interfaces in /etc/network/interfaces.\n" +" auto: network interfaces marked as 'auto' in /etc/network/interfaces.\n" +" non-'auto' network interfaces will be ignored.\n" +" hotplug: selected network interfaces by 'mapping hotplug' stanzas\n" +" in /etc/network/interfaces. In this case, hotplug will bring up\n" +" the network interface with logical interface name\n" +" (e.g. ifup eth0=hotplug)." +msgstr "" +" l'apparition d'une interface rseau sur le systme, hotplug la dtectera " +"et tentera de l'activer avec la commande ifup. Vous pouvez choisir quelles " +"interfaces rseau seront gres de cette faon :\n" +" - all : toutes les interfaces rseau mentionnes dans\n" +" /etc/network/interfaces ;\n" +" - auto : les interfaces comportant la mention auto dans\n" +" /etc/network/interfaces. Les autres interfaces rseau seront\n" +" ignores ; - hotplug : les interfaces rseau comportant la " +"mention mapping hotplug \n" +" dans /etc/network/interfaces. Dans ce cas, hotplug activera " +"l'interface\n" +" en utilisant son nom logique (p. ex. ifup eth0=hotplug )." + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "Do you want to ignore PCI display devices?" +msgstr "Faut-il ignorer les priphriques d'affichage PCI ?" + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "" +"By default, hotplug ignores PCI display devices, so device drivers won't be " +"loaded automatically." +msgstr "" +"Par dfaut, hotplug ignore les priphriques d'affichage PCI et ne chargera " +"pas leurs pilotes automatiquement." + +#~ msgid "USB keyboard configuration" +#~ msgstr "Configuration du clavier USB" + +#~ msgid "" +#~ "If you're booting with a USB keyboard and/or mouse, and want to defend " +#~ "against boot failures like missing modules, you should probably use " +#~ "static linking for the \"hid\", \"keybdev\" (and/or \"mousedev\"), \"input" +#~ "\", \"usbcore\", and USB Host Controller modules." +#~ msgstr "" +#~ "Si vous dmarrez avec un clavier ou une souris USB et que vous souhaitez " +#~ "vous prmunir contre des erreurs lors du dmarrage, telles que des " +#~ "modules manquants, vous devriez probablement lier statiquement les " +#~ "modules hid, keybdev (ou mousedev), input, usbcore " +#~ "ainsi que les modules de votre contrleur USB hte." + +#~ msgid "Do you use USB with hotplugging?" +#~ msgstr "Utilisez-vous l'insertion chaud avec USB?" + +#~ msgid "" +#~ "By default, hotplug will load appropriate USB modules automatically if " +#~ "USB device is plugged in. If you want to you can choose to turn this " +#~ "behavior off, which will set USBD_ENABLE=false in /etc/default/hotplug. " +#~ "You may also prevent all hotplugging with the kernel CONFIG_HOTPLUG " +#~ "option, or by putting an empty pathname in /proc/sys/kernel/hotplug." +#~ msgstr "" +#~ "Par dfaut, hotplug chargera automatiquement les modules USB lors de " +#~ "l'insertion d'un priphrique USB. Vous pouvez dsactiver cette " +#~ "fonctionnalit, ce qui provoquera l'ajout de la directive " +#~ "USBD_ENABLE=false dans /etc/default/hotplug.usb. Vous pouvez " +#~ "galement interdire toute insertion chaud en utilisant l'option du " +#~ "noyau CONFIG_HOTPLUG ou en mentionnant un chemin d'accs vide dans /proc/" +#~ "sys/kernel/hotplug." --- hotplug-0.0.20040329.orig/debian/po/ja.po +++ hotplug-0.0.20040329/debian/po/ja.po @@ -0,0 +1,124 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-27 01:31+0900\n" +"PO-Revision-Date: 2004-04-18 09:33+0900\n" +"Last-Translator: Kenshi Muto \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "Do you use USB mouse with X11?" +msgstr "USB ޥ X11 ǻȤǤ?" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "" +"If you need to use a USB mouse with X, the X server needs to be able to open " +"\"/dev/input/mice\" on startup. That means you can't normally hotplug a " +"mouse you plan to use with X; it needs some modules preloaded. However, " +"hotplug has a hack to let this work, which you can turn on here if you " +"anticipate using a USB mouse." +msgstr "" +"⤷ X USB ޥȤɬפΤʤ顢X Ф \"/dev/input/mice\" " +"ץǤ褦ˤʤäƤʤФޤ󡣤 X11 ȤȤ˻Ȥ" +" USB ޥϥۥåȥץ饰ǤϻȤʤȤ̣Ǥ ⥸塼򤢤餫" +"ɤƤɬפޤ⤷ͥ˥󥯤ƤʤʤС֤" +"פƤ (X11_USBMICE_HACK=true ꤵޤ)" + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Which USB modules do you want to be preloaded?" +msgstr "ɤ USB ⥸塼򤢤餫ɤƤǤ?" + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Before running hotplug support, you can preload some USB modules." +msgstr "" +"hotplug ưˡĤ USB ⥸塼򤢤餫ɤ뤳Ȥ" +"ޤ" + +#. Type: select +#. Description +#: ../templates:22 +msgid "Which network interfaces do you want to be managed by hotplug?" +msgstr "hotplug Ǵͥåȥ󥿡եϤɤǤ?" + +#. Type: select +#. Description +#: ../templates:22 +msgid "" +"When a network interface appears in the system, hotplug will detect it and " +"try to up it by using ifup. You can select hot-pluggable network " +"interfaces:\n" +" all: all network interfaces in /etc/network/interfaces.\n" +" auto: network interfaces marked as 'auto' in /etc/network/interfaces.\n" +" non-'auto' network interfaces will be ignored.\n" +" hotplug: selected network interfaces by 'mapping hotplug' stanzas\n" +" in /etc/network/interfaces. In this case, hotplug will bring up\n" +" the network interface with logical interface name\n" +" (e.g. ifup eth0=hotplug)." +msgstr "" +"ƥ˥ͥåȥ󥿡եȤhotplug Ϥ򸡽Ф " +"ifup ȤäƵư褦Ȥޤۥåȥץ饰ǽʥͥåȥ󥿡ե" +"Ǥޤ:\n" +" ٤: /etc/network/interfaces ˤ뤹٤ƤΥͥåȥ󥿡ե" +"\n" +" ư: /etc/network/interfaces 'auto' ȥޡƤͥåȥ\n" +" ե\n" +" 'auto' ǤϤʤ󥿡ե̵뤵ޤ\n" +" hotplug: /etc/network/interfaces 'mapping hotplug' ˤä򤵤\n" +" ͥåȥ󥿡եξ硢hotplug \n" +" ե̾ǥͥåȥ󥿡եưޤ\n" +" (: ifup eth0=hotplug)" + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "Do you want to ignore PCI display devices?" +msgstr "PCI ǥץ쥤ǥХ̵뤷ޤ?" + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "" +"By default, hotplug ignores PCI display devices, so device drivers won't be " +"loaded automatically." +msgstr "" +"ǥեȤǤϡhotplug PCI ǥץ쥤ǥХ̵뤷ޤΤᡢ" +"Хɥ饤ФϼưŪˤϥɤޤ" + +#~ msgid "USB keyboard configuration" +#~ msgstr "USB ܡɤ" + +#~ msgid "" +#~ "If you're booting with a USB keyboard and/or mouse, and want to defend " +#~ "against boot failures like missing modules, you should probably use " +#~ "static linking for the \"hid\", \"keybdev\" (and/or \"mousedev\"), \"input" +#~ "\", \"usbcore\", and USB Host Controller modules." +#~ msgstr "" +#~ "⤷USB ܡɤޥ֡Ȼ˻ȤäƤơ⥸塼뤬ʤʤ" +#~ " ֡Ȥ꤬ʤ褦ˤʤ顢\"hid\"\"keybdev\" ( " +#~ "\"mousedev\") \"input\", \"usbcore\" USB ۥȥȥΥ⥸塼" +#~ "򥹥ƥå󥯤ˤƤޤ礦" --- hotplug-0.0.20040329.orig/debian/po/it.po +++ hotplug-0.0.20040329/debian/po/it.po @@ -0,0 +1,99 @@ +# Italian (it) translation of hotplug +# Copyright (C) 2004 Free Software Foundation, Inc. +# This file is distributed under the same license as the hotplug package. +# Luca Monducci , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: hotplug 0.0.20040329 debconf templates\n" +"POT-Creation-Date: 2003-03-04 22:06+0100\n" +"PO-Revision-Date: 2004-10-04 21:56+0200\n" +"Last-Translator: Luca Monducci \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "Do you use USB mouse with X11?" +msgstr "Si utilizza un mouse USB con X11?" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "" +"If you need to use a USB mouse with X, the X server needs to be able to open " +"\"/dev/input/mice\" on startup. That means you can't normally hotplug a " +"mouse you plan to use with X; it needs some modules preloaded. However, " +"hotplug has a hack to let this work, which you can turn on here if you " +"anticipate using a USB mouse." +msgstr "" +"Per utilizzare un mouse USB con X, il server X deve essere in grado di " +"aprire «/dev/input/mice» all'avvio. In pratica non si può collegare un " +"mouse a caldo e usarlo con X; è necessario precaricare alcuni moduli. Se " +"si prevede di usare un mouse USB hotplug ha una specifica funzione per " +"risolvere questo problema che è possibile attivare adesso." + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Which USB modules do you want to be preloaded?" +msgstr "Quali moduli USB si vuole precaricare?" + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Before running hotplug support, you can preload some USB modules." +msgstr "" +"Prima di avviare il supporto hotplug è possibile precaricare alcuni " +"moduli USB." + +#. Type: select +#. Description +#: ../templates:22 +msgid "Which network interfaces do you want to be managed by hotplug?" +msgstr "Quali interfacce di rete si vuole gestire con hotplug?" + +#. Type: select +#. Description +#: ../templates:22 +msgid "" +"When a network interface appears in the system, hotplug will detect it and " +"try to up it by using ifup. You can select hot-pluggable network " +"interfaces:\n" +" all: all network interfaces in /etc/network/interfaces.\n" +" auto: network interfaces marked as 'auto' in /etc/network/interfaces.\n" +" non-'auto' network interfaces will be ignored.\n" +" hotplug: selected network interfaces by 'mapping hotplug' stanzas\n" +" in /etc/network/interfaces. In this case, hotplug will bring up\n" +" the network interface with logical interface name\n" +" (e.g. ifup eth0=hotplug)." +msgstr "" +"Quando una interfaccia di rete viene aggiunta al sistema, hotplug la rileva " +"e tenta di attivarla utilizzando ifup. Si può scegliere quali interfacce di " +"rete sono inseribili a caldo:\n" +" all: tutte le interfacce di rete elencate in /etc/network/interfaces.\n" +" auto: le interfacce di rete marcate come «auto» in /etc/network/interfaces\n" +" le interfacce di rete non-«auto» saranno ignorate.\n" +" hotplug: le intefacce di rete nella sezione «mapping hotplug» di\n" +" /etc/network/interfaces. In questo caso hotplug attiva l'interfaccia\n" +" di rete con un nome logico (p.e. ifup eth0=hotplug)." + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "Do you want to ignore PCI display devices?" +msgstr "Ingnorare i dispositivi PCI di visualizzazione?" + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "" +"By default, hotplug ignores PCI display devices, so device drivers won't be " +"loaded automatically." +msgstr "" +"Con la configurazione predefinita hotplug ignora i dispositivi PCI di " +"visualizzazione e quindi i driver di questi dispositivi non sono caricati " +"automaticamente." --- hotplug-0.0.20040329.orig/debian/po/nl.po +++ hotplug-0.0.20040329/debian/po/nl.po @@ -0,0 +1,139 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: hotplug\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-27 01:31+0900\n" +"PO-Revision-Date: 2004-07-04 15:52-0500\n" +"Last-Translator: Bart Cornelis \n" +"Language-Team: debian-l10n-dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "Do you use USB mouse with X11?" +msgstr "Gebruikt u een USB-muis in X11 (de grafische omgeving)?" + +# Type: boolean +# Description +#. Type: boolean +#. Description +#: ../templates:4 +msgid "" +"If you need to use a USB mouse with X, the X server needs to be able to open " +"\"/dev/input/mice\" on startup. That means you can't normally hotplug a " +"mouse you plan to use with X; it needs some modules preloaded. However, " +"hotplug has a hack to let this work, which you can turn on here if you " +"anticipate using a USB mouse." +msgstr "" +"Indien u een USB-muis wilt gebruiken met X11 (het grafische systeem), dient " +"de X-server het apparaatbestand '/dev/input/mice' te kunnen openen bij het " +"opstarten. Dit betekent dat u een door X11 gebruikte muis niet kunt " +"aankoppelen terwijl het systeem draait omdat een aantal modules hiervoor op " +"voorhand geladen moeten worden. Er is echter een hack in hotplug om dit te " +"laten werken. U kunt deze hack hier activeren als u verwacht een USB-muis te " +"zullen gebruiken." + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Which USB modules do you want to be preloaded?" +msgstr "Welke USB-modules wilt u op voorhand geladen hebben?" + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Before running hotplug support, you can preload some USB modules." +msgstr "U kunt USB-modules laden, voor u de hotplug-ondersteuning opstart." + +# Type: select +# Description +#. Type: select +#. Description +#: ../templates:22 +msgid "Which network interfaces do you want to be managed by hotplug?" +msgstr "Welke netwerk-interfaces wilt u door hotplug laten beheren?" + +# Type: select +# Description +#. Type: select +#. Description +#: ../templates:22 +msgid "" +"When a network interface appears in the system, hotplug will detect it and " +"try to up it by using ifup. You can select hot-pluggable network " +"interfaces:\n" +" all: all network interfaces in /etc/network/interfaces.\n" +" auto: network interfaces marked as 'auto' in /etc/network/interfaces.\n" +" non-'auto' network interfaces will be ignored.\n" +" hotplug: selected network interfaces by 'mapping hotplug' stanzas\n" +" in /etc/network/interfaces. In this case, hotplug will bring up\n" +" the network interface with logical interface name\n" +" (e.g. ifup eth0=hotplug)." +msgstr "" +"Wanneer een netwerk-interface in het systeem verschijnt zal hotplug dit " +"detecteren en proberen om deze te activeren door gebruik van ifup.\n" +"U kunt de door hotplug beheerde netwerk-interfaces selecteren:\n" +" all: alle netwerk-interfaces in '/etc/network/interfaces'.\n" +" auto: alle als 'auto' gemarkeerde netwerk-interfaces in '/etc/network/" +"interfaces'.\n" +" niet met 'auto' gemarkeerde interfaces worden genegeerd.\n" +" hotplug: selecteer netwerk-interfaces m.b.v. een stanza 'mapping hotplug' " +"in /etc/network/interfaces.\n" +" in dit geval zal hotplug de netwerk-interface activeren met de " +"logische interfacenaam\n" +" (b.v. ifup eth0=hotplug)." + +# Type: boolean +# Description +#. Type: boolean +#. Description +#: ../templates:36 +msgid "Do you want to ignore PCI display devices?" +msgstr "Wilt u PCI-weergave-apparaten negeren?" + +# Type: boolean +# Description +#. Type: boolean +#. Description +#: ../templates:36 +msgid "" +"By default, hotplug ignores PCI display devices, so device drivers won't be " +"loaded automatically." +msgstr "" +"Standaard zal hotplug PCI-weergave-apparaten negeren, zodat stuurprogramma's " +"niet automatisch geladen worden." + +# Type: note +# Description +#~ msgid "USB keyboard configuration" +#~ msgstr "USB-toetsenbordconfiguratie" + +#~ msgid "" +#~ "If you're booting with a USB keyboard and/or mouse, and want to defend " +#~ "against boot failures like missing modules, you should probably use " +#~ "static linking for the \"hid\", \"keybdev\" (and/or \"mousedev\"), \"input" +#~ "\", \"usbcore\", and USB Host Controller modules." +#~ msgstr "" +#~ "Indien u uw systeem opstart met eem USB-toetsenbord en/of USB-muis, en " +#~ "zich wilt beschermen tegen mislukt opstarten door ontbrekende modules, " +#~ "dan kunt u best de \"hid\", \"keybdev\" (en/of \"mousedev\"), \"input\", " +#~ "\"usbcore\", en USB Host-Controllermodules statisch linken." + +#~ msgid "${usbmodules}" +#~ msgstr "${usbmodules}" --- hotplug-0.0.20040329.orig/debian/po/ru.po +++ hotplug-0.0.20040329/debian/po/ru.po @@ -0,0 +1,122 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: hotplug 0.0.20040329\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-27 01:31+0900\n" +"PO-Revision-Date: 2004-05-23 17:43+0400\n" +"Last-Translator: Dan Korostelev \n" +"Language-Team: Russian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "Do you use USB mouse with X11?" +msgstr "Вы собираетесь использовать USB-мышь с оконной системой X11?" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "" +"If you need to use a USB mouse with X, the X server needs to be able to open " +"\"/dev/input/mice\" on startup. That means you can't normally hotplug a " +"mouse you plan to use with X; it needs some modules preloaded. However, " +"hotplug has a hack to let this work, which you can turn on here if you " +"anticipate using a USB mouse." +msgstr "" +"Если вы хотите использовать USB-мышь в оконной системе X, X-сервер должен " +"иметь возможность обращаться к устройству \"/dev/input/mice\" при загрузке. " +"Это означает, что вы не можете просто подключить мышь \"на лету\" при работе " +"в X, придётся загрузить некоторые модули, однако в hotplug есть обходной " +"путь,который вам следует использовать, если вы хотите пользоваться USB-мышью." + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Which USB modules do you want to be preloaded?" +msgstr "Обязательную загрузку каких модулей USB вы бы хотели установить?" + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Before running hotplug support, you can preload some USB modules." +msgstr "" +"Перед запуском поддержки hotplug (подключение устройств \"на лету\"), вы " +"можете установить обязательную загрузку некоторых драйверов USB." + +#. Type: select +#. Description +#: ../templates:22 +msgid "Which network interfaces do you want to be managed by hotplug?" +msgstr "Управление какими сетевыми интерфейсами вы бы хотели доверить hotplug?" + +#. Type: select +#. Description +#: ../templates:22 +msgid "" +"When a network interface appears in the system, hotplug will detect it and " +"try to up it by using ifup. You can select hot-pluggable network " +"interfaces:\n" +" all: all network interfaces in /etc/network/interfaces.\n" +" auto: network interfaces marked as 'auto' in /etc/network/interfaces.\n" +" non-'auto' network interfaces will be ignored.\n" +" hotplug: selected network interfaces by 'mapping hotplug' stanzas\n" +" in /etc/network/interfaces. In this case, hotplug will bring up\n" +" the network interface with logical interface name\n" +" (e.g. ifup eth0=hotplug)." +msgstr "" +"Когда в системе появляется сетевой интерфейс, hotplug определяет его " +"ипытается запустить его с помощью команды ifup. Вы можете выбрать " +"сетевыеинтерфейсы, управляемые hotplug:\n" +" all: все сетевые интерфейсы в файле /etc/network/interfaces.\n" +" auto: интерфейсы помеченные как 'auto' в файле /etc/network/interfaces.\n" +" интерфейсы без метки-'auto' будут игнорированы.\n" +" hotplug: только интерфейсы, выбранне в секции 'mapping hotplug'\n" +" в файле /etc/network/interfaces. В этом случае, hotplug будет " +"поднимать\n" +" сетевые интерфейсы с логическим именем\n" +" (например: ifup eth0=hotplug)." + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "Do you want to ignore PCI display devices?" +msgstr "Вы хотите и дальше пропускать загрузку модулей для этих устройств?" + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "" +"By default, hotplug ignores PCI display devices, so device drivers won't be " +"loaded automatically." +msgstr "" +"По умолчанию, hotplug не загружает автоматически драйверы для PCI-устройств " +"вывода на экран." + +#~ msgid "USB keyboard configuration" +#~ msgstr "Настройка USB-клавиатуры" + +#~ msgid "" +#~ "If you're booting with a USB keyboard and/or mouse, and want to defend " +#~ "against boot failures like missing modules, you should probably use " +#~ "static linking for the \"hid\", \"keybdev\" (and/or \"mousedev\"), \"input" +#~ "\", \"usbcore\", and USB Host Controller modules." +#~ msgstr "" +#~ "Если вы пользуетесь USB-клавиатурой или USB-мышью и хотите предостеречь " +#~ "себя от возможных ошибок загрузки модулей, возможно вы захотите " +#~ "установить обязательную загрузку таких модулей как: \"hid\", \"keybdev" +#~ "\" (и/или \"mousedev\"), \"input\", \"usbcore\" имодули контроллеров USB." --- hotplug-0.0.20040329.orig/debian/po/tr.po +++ hotplug-0.0.20040329/debian/po/tr.po @@ -0,0 +1,107 @@ +# Turkish translation of hotplug. +# This file is distributed under the same license as the hotplug package. +# Gürkan Aslan , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: hotplug\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-27 01:31+0900\n" +"PO-Revision-Date: 2004-04-25 14:40+0300\n" +"Last-Translator: Gürkan Aslan \n" +"Language-Team: Turkish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "Do you use USB mouse with X11?" +msgstr "X11 altında USB fare kullanıyor musunuz?" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "" +"If you need to use a USB mouse with X, the X server needs to be able to open " +"\"/dev/input/mice\" on startup. That means you can't normally hotplug a " +"mouse you plan to use with X; it needs some modules preloaded. However, " +"hotplug has a hack to let this work, which you can turn on here if you " +"anticipate using a USB mouse." +msgstr "" +"X Window'da USB fare kullanmanız gerekiyorsa, X sunucusunun açılış sırasında " +"\"/dev/input/mice\" aygıtını açabilmesi gerekir. Bu şu anlama gelir: X ile " +"kullanmayı planladığınız fareyi çalışır durumda takçıkar yapmanız normalde " +"mümkün değildir; bunun için bazı modüllerin önceden yüklenmiş olması " +"zorunludur. Yine de bu özelliği kullanmak isterseniz çalışır durumda " +"takçıkar desteğine ait bir hile bunu mümkün kılar. Bu özelliği şu an " +"etkinleştirebilirsiniz." + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Which USB modules do you want to be preloaded?" +msgstr "Hangi USB modüllerini yüklemek istiyorsunuz?" + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Before running hotplug support, you can preload some USB modules." +msgstr "" +"Çalışır durumda takçıkar desteğini çalıştırmadan önce bazı USB modüllerini " +"yükleyebilirsiniz." + +#. Type: select +#. Description +#: ../templates:22 +msgid "Which network interfaces do you want to be managed by hotplug?" +msgstr "" + +#. Type: select +#. Description +#: ../templates:22 +msgid "" +"When a network interface appears in the system, hotplug will detect it and " +"try to up it by using ifup. You can select hot-pluggable network " +"interfaces:\n" +" all: all network interfaces in /etc/network/interfaces.\n" +" auto: network interfaces marked as 'auto' in /etc/network/interfaces.\n" +" non-'auto' network interfaces will be ignored.\n" +" hotplug: selected network interfaces by 'mapping hotplug' stanzas\n" +" in /etc/network/interfaces. In this case, hotplug will bring up\n" +" the network interface with logical interface name\n" +" (e.g. ifup eth0=hotplug)." +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "Do you want to ignore PCI display devices?" +msgstr "" + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "" +"By default, hotplug ignores PCI display devices, so device drivers won't be " +"loaded automatically." +msgstr "" + +#~ msgid "USB keyboard configuration" +#~ msgstr "USB klavye yapılandırması" + +#~ msgid "" +#~ "If you're booting with a USB keyboard and/or mouse, and want to defend " +#~ "against boot failures like missing modules, you should probably use " +#~ "static linking for the \"hid\", \"keybdev\" (and/or \"mousedev\"), \"input" +#~ "\", \"usbcore\", and USB Host Controller modules." +#~ msgstr "" +#~ "Eğer bir USB klavye ve/veya fareyle açılış yapıyorsanız ve eksik modüller " +#~ "gibi açılış başarısızlıklarına karşı korunmak istiyorsanız, muhtemelen " +#~ "\"hid\", \"keybdev\" (ve/veya \"mousedev\"), \"input\", \"usbcore\" ve " +#~ "USB Hizmet Denetleyicisi modüllerini statik olarak bağlamalısınız." + +#~ msgid "${usbmodules}" +#~ msgstr "${usbmodules}" --- hotplug-0.0.20040329.orig/debian/po/POTFILES.in +++ hotplug-0.0.20040329/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] templates --- hotplug-0.0.20040329.orig/debian/po/pt_BR.po +++ hotplug-0.0.20040329/debian/po/pt_BR.po @@ -0,0 +1,142 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: hotplug\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-27 01:31+0900\n" +"PO-Revision-Date: 2004-07-31 21:31-0300\n" +"Last-Translator: Andr Lus Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "Do you use USB mouse with X11?" +msgstr "Voc utiliza mouse USB com o X11 ?" + +#. Type: boolean +#. Description +#: ../templates:4 +msgid "" +"If you need to use a USB mouse with X, the X server needs to be able to open " +"\"/dev/input/mice\" on startup. That means you can't normally hotplug a " +"mouse you plan to use with X; it needs some modules preloaded. However, " +"hotplug has a hack to let this work, which you can turn on here if you " +"anticipate using a USB mouse." +msgstr "" +"Caso voc precise utilizar um mouse USB com o X, o servidor X precisa ser " +"capaz de abrir o dispositivo \"/dev/input/mice\" quando for iniciado. Isso " +"signifca que voc no pode \"hotplugar\" um mouse que voc planeja utilizar " +"com o X; o mouse precisa de alguns mdulos pr-carregados. Porm, o hotplug " +"possui um \"hack\" que permite que isso funcione, o qual voc pode habilitar " +"caso esteja planejando usar um mouse USB." + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Which USB modules do you want to be preloaded?" +msgstr "Quais mdulos USB voc quer que sejam pr-carregados ?" + +#. Type: multiselect +#. Description +#: ../templates:15 +msgid "Before running hotplug support, you can preload some USB modules." +msgstr "" +"Antes de executar o suporte hotplug, voc pode pr-carregar alguns mdulos " +"USB." + +#. Type: select +#. Description +#: ../templates:22 +msgid "Which network interfaces do you want to be managed by hotplug?" +msgstr "" +"Quais interfaces de rede voc deseja que sejam gerenciadas pelo hotplug ?" + +#. Type: select +#. Description +#: ../templates:22 +msgid "" +"When a network interface appears in the system, hotplug will detect it and " +"try to up it by using ifup. You can select hot-pluggable network " +"interfaces:\n" +" all: all network interfaces in /etc/network/interfaces.\n" +" auto: network interfaces marked as 'auto' in /etc/network/interfaces.\n" +" non-'auto' network interfaces will be ignored.\n" +" hotplug: selected network interfaces by 'mapping hotplug' stanzas\n" +" in /etc/network/interfaces. In this case, hotplug will bring up\n" +" the network interface with logical interface name\n" +" (e.g. ifup eth0=hotplug)." +msgstr "" +"Quando uma interface de rede adicionado ao sistema, o hotplug ir detect-" +"la e tentar ativ-la utilizando o ifup. Voc pode selecionar interfaces de " +"rede conectveis a quente (hot-pluggable) :\n" +" todas: todas as interfaces de rede em /etc/network/interfaces.\n" +" auto: interfaces de rede marcadas como 'auto' em /etc/network/interfaces.\n" +" interfaces de rede 'no-auto' sero ignoradas.\n" +" hotplug: interfaces de rede selecionadas por estrofes 'mapping hotplug'\n" +" em /etc/network/interfaces. Nesse caso, o htoplug ir ativar \n" +" a interface de rede com o nome lgico de interface (por exemplo, \n" +" ifup eth0=hotplug)." + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "Do you want to ignore PCI display devices?" +msgstr "Voc deseja ignorar dispositivos de exibio PCI ?" + +#. Type: boolean +#. Description +#: ../templates:36 +msgid "" +"By default, hotplug ignores PCI display devices, so device drivers won't be " +"loaded automatically." +msgstr "" +"Por padro, o hotplug ignorar dispositivos de exibio PCI, de forma que " +"drivers para esses dispositivos no sejam carregados automaticamente." + +#~ msgid "USB keyboard configuration" +#~ msgstr "Configurao de teclado USB" + +#~ msgid "" +#~ "If you're booting with a USB keyboard and/or mouse, and want to defend " +#~ "against boot failures like missing modules, you should probably use " +#~ "static linking for the \"hid\", \"keybdev\" (and/or \"mousedev\"), \"input" +#~ "\", \"usbcore\", and USB Host Controller modules." +#~ msgstr "" +#~ "Se voc est iniciando com um teclado USB e/ou um mouse, e quer se " +#~ "proteger contra falhas de inicializao como mdulos faltantes, voc " +#~ "dever provavelmente usar ligao esttica para os mdulos \"hid\", " +#~ "\"keybdev\" (e/ou \"mousedev\"), \"input\", \"usbcore\" e USB Host " +#~ "Controller." + +#~ msgid "Do you use USB with hotplugging?" +#~ msgstr "Voc utiliza USB com hotplugging ?" + +#~ msgid "" +#~ "By default, hotplug will load appropriate USB modules automatically if " +#~ "USB device is plugged in. If you want to you can choose to turn this " +#~ "behavior off, which will set USBD_ENABLE=false in /etc/default/hotplug. " +#~ "You may also prevent all hotplugging with the kernel CONFIG_HOTPLUG " +#~ "option, or by putting an empty pathname in /proc/sys/kernel/hotplug." +#~ msgstr "" +#~ "Por padro, o hotplug ir carregar mdulos USB apropriados " +#~ "automaticamente caso um dispositivo USB seja inserido. Caso voc deseje, " +#~ " possvel desabilitar esse comportamento, o que ir definir " +#~ "USBD_ENABLE=false em /etc/default/hotplug. Voc pode tambm evitar todo " +#~ "hotplugging com a opo de kernel CONFIG_HOTPLUG ou informando um caminho " +#~ "vazio em /proc/sys/kernel/hotplug." --- hotplug-0.0.20040329.orig/debian/control +++ hotplug-0.0.20040329/debian/control @@ -0,0 +1,35 @@ +Source: hotplug +Section: admin +Priority: standard +Maintainer: Fumitoshi UKAI +Uploaders: Fumitoshi UKAI , Marco d'Itri +Standards-Version: 3.6.1.1 +Build-Depends-Indep: debhelper (>= 4.2) + +Package: hotplug +Architecture: all +Depends: module-init-tools (>= 3.2-pre1-2ubuntu1) | modutils (>= 2.4.26-1.2ubuntu1), debconf (>= 0.2.26), procps, grep (>= 2.5.1.ds1-2), sed (>= 4), bash (>= 2.05b-1), lsb-base (>= 1.3-9ubuntu3) +Recommends: ifupdown, usbutils, pciutils, grepmap +Suggests: ifrename +Conflicts: usbmgr, alsa-base (<< 1.0.4-2) +Replaces: usbmgr +Description: Linux Hotplug Scripts + This package contains the scripts necessary for hotplug Linux support, + and lets you plug in new devices and use them immediately. + It includes support for PCI, Cardbus (PCMCIA), USB and Firewire devices + and can automatically configure network interfaces. +Task: desktop + +Package: hotplug-udeb +XC-Package-Type: udeb +Section: debian-installer +Priority: optional +Architecture: all +Recommends: grepmap-udeb +Description: Linux Hotplug Scripts + This package contains the scripts necessary for hotplug Linux support, + and lets you plug in new devices and use them immediately. + It includes support for PCI, Cardbus (PCMCIA), USB and Firewire devices + and can automatically configure network interfaces. + . + This is a minimal package for use in debian-installer. --- hotplug-0.0.20040329.orig/debian/sys-build.mk +++ hotplug-0.0.20040329/debian/sys-build.mk @@ -0,0 +1,167 @@ +#!/usr/bin/make -f +# Separate tarball/patch build system by Adam Heath + +# The magic targets that you need to concern yourself with are: +# +# source.build: Unpacks upstream tarballs, optionally applies patches +# to fix the upstream patches, then applies upstream +# patches. +# source.make: Applies debian patches. +# source.clean: Cleans the build directory, then unfixes the upstream +# patches. +# source.compile: Will compile the source for you. Please check +# debian/scripts/vars. +# source.cmd: When calling this target, if you define a variable +# SOURCE_CMD, it will run that command in the build +# tree. +# make-diff: Generates debian.diff in the current directory which +# contains all edits that are currently in the build +# tree. +# +# Nothing in this file should require any editting. Please look at +# debian/scripts/vars for things to change for the local environment. +# +# debian/rules target command +# ---------------------------------------------------------------- +# clean: $(MAKE) -f debian/sys-build.mk source.clean +# build: $(MAKE) -f debian/sys-build.mk source.compile +# for simple systems. +# build: $(MAKE) -f debian/sys-build.mk source.make +# and, in the rules file, you can +# build the targets you want. +SHELL=/bin/bash +ifndef NOISY +.SILENT: +endif + +include debian/scripts/vars +# remove quotes +DIFF_EXCLUDE:=$(patsubst %,-x %,$(shell echo $(DIFF_EXCLUDE))) + +ifdef TAR_DIR +BUILD_TREE=$(SOURCE_DIR)/$(TAR_DIR) +else +BUILD_TREE=$(SOURCE_DIR) +endif + +SOURCE_CMD=: + +ifdef CLEAN_IGNORE + CLEAN_CMD=- + CLEAN_SH= +else + CLEAN_CMD= + CLEAN_SH= +endif +ifndef CLEAN_TARGET + CLEAN_TARGET=clean +endif + +foo: + echo $(DIFF_EXCLUDE) + +make-diff: + mv $(BUILD_TREE) bak + $(MAKE) -f debian/sys-build.mk source.clean + $(MAKE) -f debian/sys-build.mk source.make + mv $(BUILD_TREE) $(BUILD_TREE).orig + mv bak $(BUILD_TREE) + +ifdef TAR_DIR +ifdef CLEAN_TARGET_EXTERNAL + $(CLEAN_CMD)$(MAKE) -f debian/rules $(CLEAN_TARGET_EXTERNAL) +else + $(CLEAN_CMD)$(MAKE) -C $(BUILD_TREE) $(CLEAN_TARGET) +endif + -(cd $(SOURCE_DIR);diff -ruN $(TAR_DIR).orig $(TAR_DIR) $(DIFF_EXCLUDE)) > debian.diff +else +ifdef CLEAN_TARGET_EXTERNAL + $(CLEAN_CMD)$(MAKE) -f debian/rules $(CLEAN_TARGET_EXTERNAL) +else + $(CLEAN_CMD)for a in $(BUILD_TREE)/*;do $(MAKE) -C $$a $(CLEAN_TARGET);done +endif + -(diff -ruN $(BUILD_TREE).orig $(BUILD_TREE) $(DIFF_EXCLUDE)) > debian.diff + if [ ! -s debian.diff ];then\ + rm debian.diff;\ + fi +endif + rm -rf $(BUILD_TREE).orig + +patchapply: $(STAMP_DIR)/patchapply +$(STAMP_DIR)/patchapply: $(STAMP_DIR)/source.build $(STAMP_DIR) + $(SHELL) debian/scripts/lib patch.apply + touch $@ + rm -f $(STAMP_DIR)/patchunapply + +patchunapply: $(STAMP_DIR)/patchunapply +$(STAMP_DIR)/patchunapply: $(STAMP_DIR)/source.build $(STAMP_DIR) + $(SHELL) debian/scripts/lib patch.unapply + touch $@ + rm -f $(STAMP_DIR)/patchapply + +.export: SOURCE_TREE + +# +# The rules that really do the work all start with $(STAMPDIR) +# This little trick allows us to use stamp files to keep us from +# having to rerun long targets over and over. It also puts +# all stamp files in one place, for easy cleaning. +# +# If a stampdir rule depends on something else, be sure it is +# another stampdir rule. Depending on base rule won't work. +# + +source.build: $(STAMP_DIR)/source.build +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.build +$(STAMP_DIR)/source.build: $(STAMP_DIR)/source.unpack $(STAMP_DIR)/source.patch $(STAMP_DIR) + touch $@ + +source.make: $(STAMP_DIR)/source.make +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.make +$(STAMP_DIR)/source.make: $(STAMP_DIR)/source.build $(STAMP_DIR)/patchapply $(STAMP_DIR) + touch $@ + +source.unpack: $(STAMP_DIR)/source.unpack +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.unpack +$(STAMP_DIR)/source.unpack: $(STAMP_DIR) + $(SHELL) debian/scripts/source.unpack + touch $@ + +source.patch: $(STAMP_DIR)/source.patch +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.patch +$(STAMP_DIR)/source.patch: $(STAMP_DIR)/source.unpack $(STAMP_DIR)/fix.source.patch $(STAMP_DIR) + $(SHELL) debian/scripts/lib source.patch + touch $@ + +fix.source.patch: $(STAMP_DIR)/fix.source.patch +STAMP_DIR_TARGETS+= $(STAMP_DIR)/fix.source.patch +$(STAMP_DIR)/fix.source.patch: $(STAMP_DIR) + $(SHELL) debian/scripts/lib fix.source.patch + touch $@ + +unfix.source.patch: $(STAMP_DIR)/unfix.source.patch +STAMP_DIR_TARGETS+= $(STAMP_DIR)/unfix.source.patch +$(STAMP_DIR)/unfix.source.patch: $(STAMP_DIR) + $(SHELL) debian/scripts/lib unfix.source.patch + touch $@ + +source.compile: $(STAMP_DIR)/source.compile +STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.compile +$(STAMP_DIR)/source.compile: $(STAMP_DIR)/source.make $(STAMP_DIR) + $(MAKE) -C $(BUILD_TREE) $(BUILD_TARGET) + touch $@ + +source.command: + (cd $(BUILD_TREE); $(SOURCE_CMD)) + +DIR_TARGETS+=$(STAMP_DIR) +$(STAMP_DIR_TARGETS): $(STAMP_DIR) + +$(DIR_TARGETS)/: + mkdir -p $@ + +source.clean: unfix.source.patch + $(SHELL) debian/scripts/lib source.clean + rm -f $(STAMP_DIR_TARGETS) + rm -rf $(STAMP_DIR) + $(MAKE) -C debian/scripts clean --- hotplug-0.0.20040329.orig/debian/hotplug-udeb.dirs +++ hotplug-0.0.20040329/debian/hotplug-udeb.dirs @@ -0,0 +1,20 @@ +/sbin/ +/etc/default/ +/etc/hotplug/ +/etc/hotplug/usb/ +/etc/hotplug/blacklist.d/ +/etc/hotplug/pci/ +/etc/hotplug.d/ +/etc/hotplug.d/default/ +/etc/hotplug.d/chandev/ +/etc/hotplug.d/dock/ +/etc/hotplug.d/ieee1394/ +/etc/hotplug.d/input/ +/etc/hotplug.d/net/ +/etc/hotplug.d/pci/ +/etc/hotplug.d/scsi/ +/etc/hotplug.d/usb/ +/etc/modprobe.d/ +/etc/modprobe.d/isapnp/ +/var/run/usb/ +/usr/lib/hotplug/firmware/ --- hotplug-0.0.20040329.orig/debian/rules +++ hotplug-0.0.20040329/debian/rules @@ -0,0 +1,91 @@ +#!/usr/bin/make -f +SHELL=/bin/bash -e + +#export DH_VERBOSE=1 +NOISY=1 + +include debian/scripts/vars + +BUILD_DIR := $(SOURCE_DIR)/$(TAR_DIR) +B := $(BUILD_DIR) +D := $(CURDIR)/debian/hotplug +U := $(CURDIR)/debian/hotplug-udeb + +all: build + +unpack: $(STAMP_DIR)/unpack +$(STAMP_DIR)/unpack: + $(MAKE) -f debian/sys-build.mk source.make + touch $@ + +# used by the maintainer +unpack.nopatch: + $(MAKE) -f debian/sys-build.mk source.build + +# used by the maintainer +diff: + $(MAKE) -f debian/sys-build.mk make-diff + +clean: + $(MAKE) -f debian/sys-build.mk source.clean + dh_clean + + +build: + +install: $(STAMP_DIR)/install +$(STAMP_DIR)/install: $(STAMP_DIR)/unpack + dh_testdir + dh_clean -k + dh_installdirs -i + + install --mode=755 $B/sbin/hotplug $D/sbin/hotplug + install --mode=755 $B/etc/hotplug.d/default/default.hotplug \ + $D/etc/hotplug.d/default/default.hotplug + install --mode=755 $B/etc/hotplug/*.agent $B/etc/hotplug/*.rc \ + $B/etc/hotplug/net.ifup \ + $B/etc/hotplug/*.permissions extra/*.rc $D/etc/hotplug/ + install --mode=644 $B/etc/hotplug/usb.handmap $B/etc/hotplug/blacklist \ + $B/etc/hotplug/hotplug.functions $D/etc/hotplug/ + install --mode=644 extra/isapnp.aliases $D/etc/modprobe.d/isapnp + + install --mode=755 $B/etc/hotplug.d/default/default.hotplug \ + $U/etc/hotplug.d/default/default.hotplug + install --mode=755 $B/etc/hotplug/*.agent $B/etc/hotplug/*.rc \ + $B/etc/hotplug/net.ifup \ + $B/etc/hotplug/*.permissions extra/*.rc $U/etc/hotplug/ + install --mode=644 $B/etc/hotplug/usb.handmap $B/etc/hotplug/blacklist \ + $B/etc/hotplug/hotplug.functions $U/etc/hotplug/ + install --mode=644 extra/isapnp.aliases $U/etc/modprobe.d/isapnp/isapnp.aliases + + dh_installdocs $(addprefix $B/,$(DOCS)) extra/README.modules + dh_installchangelogs $B/ChangeLog + dh_installexamples $B/etc/hotplug/usb.usermap + sed -e 's:sysconfig/usb:default/hotplug.usb:' \ + < $B/README > $D/usr/share/doc/hotplug/README + dh_installman $B/hotplug.8 + dh_installlogcheck + dh_installinit --no-start --update-rcd-params='start 40 S .' + dh_installinit --no-start \ + --update-rcd-params='start 41 S . stop 89 0 6 .' \ + --name=hotplug-net + + touch $@ + +binary-indep: $(STAMP_DIR)/install checkroot + dh_testdir + + dh_compress -i + dh_fixperms -i + dh_installdebconf -i + dh_installdeb -i + dh_gencontrol -i + dh_builddeb -i + + +binary: binary-indep + +checkroot: + test root = "`whoami`" + +.PHONY: binary binary-arch binary-indep unpack configure build clean checkroot --- hotplug-0.0.20040329.orig/debian/NEWS.Debian +++ hotplug-0.0.20040329/debian/NEWS.Debian @@ -0,0 +1,55 @@ +hotplug (0.0.20040329-5) unstable; urgency=low + + * change debconf configuration: use_net_liface -> net_agent_policy + NET_AGENT_POLICY in /etc/default/hotplug + you can select how to manage network interfaces with ifupdown. + - all: all network interfaces will be ifupped + - auto: only "auto" network interfaces will be ifupped + - hotplug: ifupped with logical interface names "hotplug" + e.g ifup eth0=hotplug + + -- Fumitoshi UKAI Wed, 7 Apr 2004 00:18:38 +0900 + +hotplug (0.0.20040329-4) unstable; urgency=low + + * new debconf configuration: use_net_liface + USE_NET_LIFACE in /etc/default/hotplug + you can select whether or not to use logical interface name + for ifup. + * new debconf configuration: ignore_pci_class_display + IGNORE_PCI_CLASS_DISPLAY in /etc/default/hotplug + by default, hotplug will ignore PCI_CLASS_DISPLAY devices, so + framebuffer device driver won't be loaded automatically. + + -- Fumitoshi UKAI Sun, 4 Apr 2004 04:30:44 +0900 + +hotplug (0.0.20040329-3) unstable; urgency=low + + * /etc/default/hotplug configuration variables are considered as + deprecated. These should be configured by using /etc/modules instead. + These would be kept for a while, but it will be eliminated in future. + * move /etc/hotplug/usb.usermap.local /etc/hotplug/usb/local.usermap + if /etc/hotplug/usb.usermap.local still exists + * /etc/hotplug/blacklist.d/ was created + if necessary, put /etc/hotplug/blacklist.d/ if the + package, such as ALSA, requires some modules.should be blacklisted. + format should be the same as /etc/hotplug/blacklist (exact module + name per each lines) + + -- Fumitoshi UKAI Fri, 2 Apr 2004 02:49:16 +0900 + +hotplug (0.0.20040311-4) unstable; urgency=low + + * hotplug don't use /etc/nohotplug any more. + The reason we introduced /etc/nohotplug was to let hotplug + delay its processing after /etc/rcS.d/S39ifupdown run, which + will erase state in /etc/network/ifstate. + However, this /etc/nohotplug seems to be cause of problems, + so this version of hotplug don't use /etc/nohotplug any more. + Instead, /etc/hotplug/net.agent will ignore any events while + runlevel S (single-user mode). + If you configure /etc/network/interfaces properly, network interface + will up by /etc/rcS.d/S40networking. + + -- Fumitoshi UKAI Sun, 14 Mar 2004 02:36:54 +0900 + --- hotplug-0.0.20040329.orig/debian/scripts/lib +++ hotplug-0.0.20040329/debian/scripts/lib @@ -0,0 +1,198 @@ +#!/bin/sh +if [ $(basename $0) = lib ];then + make -C debian/scripts sh.vars + . debian/scripts/sh.vars +fi +fetchmsg() { + local msg + msg=$1;shift + eval echo $(sed -ne "s/^$(BASENAME):$msg://p" debian/scripts/messages) +} +START() { + echo -n "$(fetchmsg START "$@") " +} +OK() { + fetchmsg OK "$@" +} +FAILED() { + fetchmsg FAILED "$@" +} +ALREADY_DONE() { + fetchmsg ALREADY_DONE "$@" +} + +BASENAME() { + local base + if [ "$cmd" ];then + base=$cmd + else + base=${0##*/} + fi + if [ x$base = x ];then + echo "Danger, Will Robinson, Danger!" 1>&2 + echo "Bash is very confused." 1>&2 + exit 1 + fi + if [ x$base = xlib ];then + echo "You can't call this directly." 1>&2 + echo "This is a library that should be sourced." 1>&2 + exit 1 + fi + echo $base +} +file2cat() { + $(decompress_prog $1) $1 +} +debug() { + echo "$@" + eval "$@" +} +decompress_prog() { + local which + which="cat" + [ $1 != ${1%.tgz} -o $1 != ${1%.gz} -o $1 != ${1%.Z} ] && which="gunzip -c" + [ $1 != ${1%.bz2} ] && which="bunzip2 -c" + [ $1 != ${1%.bz} ] && which="bunzip -c" + echo $which +} +compress_ext() { + local which + which="" + [ $1 != ${1%.gz} ] && which=gz + [ $1 != ${1%.Z} ] && which=Z + [ $1 != ${1%.bz2} ] && which=bz2 + [ $1 != ${1%.bz} ] && which=bz + echo $which +} +filetype_detect() { + local which f + which="" + f=$(echo "$1" | sed 's|:::.*||') + [ $f != ${f%.jar} ] && which=jarfile + [ $f != ${f%.zip} ] && which=zipfile + [ $f != ${f%.tgz} ] && which=tarball + [ $f != ${f%.tar.$(compress_ext $f)} ] && which=tarball + [ $f != ${f%.tar} ] && which=tarball + [ $f != ${f%.diff.$(compress_ext $f)} -o $1 != ${1%.patch.$(compress_ext $1)} ] && which=patch + [ $f != ${f%.diff} -o $1 != ${1%.patch} ] && which=patch + [ $f != ${f%.dsc} ] && which=dsc + echo $which +} +extract_tar() { + local which file dir curd + dir="$1" + shift + curd=$(pwd) + while [ $# -gt 0 ];do + file="$1" + [ "$file" = "${1#/}" ] && file="$curd/$file" + case "$(filetype_detect $file)" in + "jarfile") (cd $dir;fastjar -xf $file);; + "zipfile") (cd $dir;miniunzip -x $file);; + "tarball") $(decompress_prog $file) $file | (cd $dir;tar xvf -);; + *) echo "unsupported tarball";; + esac + shift + done +} + +do.patching() { + filetmpl=\$d/\$f + reversesort="" + reversepatch="" + + case "$cmd" in + source.patch) + mkdir -p $SOURCE_DIR/$TAR_DIR + patch_dirs="$SRC_PATCH_DIR $SRC_ADD_PATCH_DIR" + stampfiletmpl=\$STAMP_DIR/\$d/\$f + logtmpl=\$STAMP_DIR/log/\$d/\$f + dirprep="\$STAMP_DIR/log/\$d \$STAMP_DIR/\$d" + patchapplydirtmpl=\$SOURCE_DIR/\$TAR_DIR + ;; + patch.apply) + mkdir -p $SOURCE_DIR/$TAR_DIR $STAMP_DIR/patches + patch_dirs="$PATCH_DIR $ADD_PATCH_DIR" + stampfiletmpl=\$STAMP_DIR/patches/\$f + logtmpl=\$STAMP_DIR/log/\$d/\$f + dirprep=\$STAMP_DIR/log/\$d + patchapplydirtmpl=\$SOURCE_DIR/\$TAR_DIR + ;; + fix.source.patch) + if [ "$DBS_UNIFIED" -o ! -e debian/fixpatch ];then + exit + fi + mkdir -p $STAMP_DIR/fixpatch + patch_dirs=debian/fixpatch + stampfiletmpl="$STAMP_DIR/fixpatch/\$(basename \$f)" + logtmpl=\$STAMP_DIR/log/fixpatch/\$f + dirprep=\$STAMP_DIR/log/fixpatch + patchapplydirtmpl=upstream + ;; + unfix.source.patch) + if [ "$DBS_UNIFIED" -o ! -e debian/fixpatch ];then + exit + fi + mkdir -p $STAMP_DIR/fixpatch + patch_dirs=debian/fixpatch + stampfiletmpl="$STAMP_DIR/fixpatch/\$(basename \$f)" + logtmpl=\$STAMP_DIR/log/fixpatch/\$f + dirprep=\$STAMP_DIR/log/fixpatch + patchapplydirtmpl=upstream + reversesort=-r + reversepatch=-R + ;; + esac + for d in $patch_dirs;do + if [ ! -d $d ];then + continue + fi + eval mkdir -p $dirprep + for f in `(cd $d >/dev/null;find -type f ! -name 'chk-*' -o -name CVS -prune -type f 2>/dev/null )|sort $reversesort`;do + eval stampfile=$stampfiletmpl + eval log=$logtmpl + eval file=$filetmpl + eval patchapplydir=$patchapplydirtmpl + if [ ! -e $stampfile ];then + START $file + if file2cat $file | (cd $patchapplydir;patch -p1 $reversepatch) > $log;then + OK $file + touch $stampfile + else + FAILED $file + exit 1 + fi + else + ALREADY_DONE $file + fi + done + done + +} +# +# External api functions. +# + +source.clean() { + if [ "$DBS_UNIFIED" ];then + exit + fi + rm -rf $SOURCE_DIR $STAMP_DIR/upstream $STAMP_DIR/patches + rm -f $STAMP_DIR/{source.{clean,build,make}} + return +if [ x$SOURCE_DIR = x ];then + files=`find -type f -maxdepth 1 -mindepth 1` + dirs=`find -type d -maxdepth 1 -mindepth 1 ! -name 'debian' ! -name 'upstream'` + echo files=\"$files\" + echo dirs=\"$dirs\" +fi + +} +source.patch() { cmd=source.patch; do.patching; } +fix.source.patch() { cmd=fix.source.patch; do.patching; } +unfix.source.patch() { cmd=unfix.source.patch; do.patching; } +patch.apply() { cmd=patch.apply; do.patching; } + +if [ $(basename $0) = lib ];then + $1 +fi --- hotplug-0.0.20040329.orig/debian/scripts/vars +++ hotplug-0.0.20040329/debian/scripts/vars @@ -0,0 +1,31 @@ +# This file is NOT a shell script. +# +# This file gets included by both debian/rules (make) AND the scripts in +# debian/scripts (bash) +# + +# Where to cd to to unpack all the tarballs. +SOURCE_DIR=build-tree +# For a single pkg, this is the directory that is embedded in the tarball. +# For multiple pkgs, this is null. +TAR_DIR=hotplug-2004_03_29 +# Where to place all the stamp files. This directory can be removed, and +# all the targets will then be rerun. +STAMP_DIR=debian/stampdir +# When sys-build.mk is used to build the source, this is the target(s) to +# run. +BUILD_TARGET= +# When cleaning the source, during diff generation, if this is set, this +# target will be called in debian/rules. This allows for pkgs that have +# complicated cleaning rules. +CLEAN_TARGET_EXTERNAL= +# Whether to die if the source cleaning fails. +CLEAN_IGNORE=yes +# The clean target to run. Defaults to clean. +CLEAN_TARGET= +# Files to exclude from the diff. +DIFF_EXCLUDE="" +# Where the patches are located(duh!). +PATCH_DIR=debian/patches +SRC_PATCH_DIR=upstream/patches +SRC_TAR_DIR=upstream/tarballs --- hotplug-0.0.20040329.orig/debian/scripts/Makefile +++ hotplug-0.0.20040329/debian/scripts/Makefile @@ -0,0 +1,11 @@ +#!/usr/bin/make -f +all: sh.vars mk.vars + +clean: + rm -f sh.vars mk.vars + +mk.vars: vars.build vars + $(SHELL) vars.build vars make > $@ +sh.vars: vars.build vars + $(SHELL) vars.build vars shell > $@ + --- hotplug-0.0.20040329.orig/debian/scripts/messages +++ hotplug-0.0.20040329/debian/scripts/messages @@ -0,0 +1,29 @@ +fix.source.patch:START:"Fixing upstream patch $1" +fix.source.patch:OK:"successful." +fix.source.patch:FAILED:"failed!" +fix.source.patch:ALREADY_DONE:"upstream patch fixup $1 already applied!" + +unfix.source.patch:START:"Unfixing upstream patch $1 +unfix.source.patch:OK:"successful." +unfix.source.patch:FAILED:"failed! +unfix.source.patch:ALREADY_DONE:"upstream patch fixup $1 already reversed!" + +patch.unapply:START:"Reversing patch $1" +patch.unapply:OK:"successful." +patch.unapply:FAILED:"failed!" +patch.unapply:ALREADY_DONE:"Patch $1 not applied!" + +patch.apply:START:"Applying patch $1" +patch.apply:OK:"successful." +patch.apply:FAILED:"failed!" +patch.apply:ALREADY_DONE:"Patch $1 already applied!" + +source.patch:START:"Applying upstream patch $1" +source.patch:OK:"successful." +source.patch:FAILED:"failed!" +source.patch:ALREADY_DONE:"upstream patch $1 already applied!" + +source.unpack:START:"Extracting upstream tarball $1" +source.unpack:OK:"successful." +source.unpack:FAILED:"failed!" +source.unpack:ALREADY_DONE:"upstream tarball $1 already extracted!" --- hotplug-0.0.20040329.orig/debian/scripts/getglibcversion +++ hotplug-0.0.20040329/debian/scripts/getglibcversion @@ -0,0 +1,56 @@ +#!/bin/sh +# GNU C library version detection shell script. +# Copyright 1999 Branden Robinson. +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# This script probably makes about a billion too many assumptions, but it's +# better than hardcoding the glibc version on a per-architecture basis. + +set -e + +usage () { + echo "Usage: getglibcversion [option]" + echo " Where [option] may be one of:" + echo " --major return major version only" + echo " --minor return minor version only" + echo " --point return ittybitty version only" + echo "With no option, returns major.minor.ittybitty ."; +} + +case $# in + 0) ;; + 1) case $1 in + --help) usage + exit 0 ;; + --major) RETURN=1 ;; + --minor) RETURN=2 ;; + --point) RETURN=3 ;; + *) exec 1>&2 + usage + exit 1 ;; + esac ;; + *) exec 1>&2 + usage + exit 1 ;; +esac + +LIBCLIST=$(cd /lib && ls libc-*.so) + +case $(echo $LIBCLIST | wc -l | awk '{print $1}') in + 0) echo "No GNU C library found! Aborting." >&2 + exit 1 ;; + 1) ;; + *) echo "Multiple versions of GNU C library found! Aborting." >&2 + exit 1 ;; +esac + +LIBCVERSION=$(echo $LIBCLIST | sed 's/libc-//;s/\.so//') + +if [ -z $RETURN ]; then + echo $LIBCVERSION +else + echo $LIBCVERSION | cut -d. -f$RETURN +fi + +exit 0 --- hotplug-0.0.20040329.orig/debian/scripts/source.unpack +++ hotplug-0.0.20040329/debian/scripts/source.unpack @@ -0,0 +1,32 @@ +#!/bin/sh +make -C debian/scripts sh.vars +. debian/scripts/sh.vars +. debian/scripts/lib + +mkdir -p $STAMP_DIR/upstream/tarballs/ $SOURCE_DIR +if [ ! -z "$SRC_TAR_DIR" -a -d "$SRC_TAR_DIR" ];then + files=$(find $SRC_TAR_DIR -type f|sort) +else + VER=$(dpkg-parsechangelog 2>&1|egrep ^Version|cut -d " " -f 2|cut -d "-" -f 1) + SRC=$(dpkg-parsechangelog 2>&1|egrep ^Source|cut -d " " -f 2-) + files=../${SRC}_${VER}.orig.tar.gz +fi +for f in $files;do + stampfile=$STAMP_DIR/upstream/tarballs/`basename $f` + if [ ! -e $stampfile ];then + START $f + if extract_tar ${SOURCE_DIR:-.} $f > $stampfile.log;then + if [ x$SOURCE_DIR = x ];then + mkdir -p $STAMP_DIR/upstream/files/tarballs + cp $stampfile.log $STAMP_DIR/upstream/files/tarballs/`basename $f`.list + fi + OK $f + touch $stampfile + else + FAILED $f + exit 1 + fi + else + ALREADY_DONE $f + fi +done --- hotplug-0.0.20040329.orig/debian/scripts/archmap +++ hotplug-0.0.20040329/debian/scripts/archmap @@ -0,0 +1,22 @@ +#!/bin/sh +# i486 i386 i486 i586 pentium pentiumpro +if [ $(basename $0) = archmap ];then + if [ -z $1 ];then + arch=$(dpkg --print-gnu-build-architecture) + else + arch=$1 + fi +else + if [ -z $arch ];then + arch=$(dpkg --print-gnu-build-architecture) + fi +fi +set -- $(egrep ".* $arch( .*|$)" debian/scripts/archmap) +if [ -z $2 ];then + arch=$arch +else + arch=$2 +fi +if [ $(basename $0) = archmap ];then + echo $arch +fi --- hotplug-0.0.20040329.orig/debian/scripts/vars.build +++ hotplug-0.0.20040329/debian/scripts/vars.build @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +sed_cmd='' +cat $1 | while read REPLY; do + case "$REPLY" in + \#*|"") continue;; + *) + var=$(echo $REPLY|sed 's/\([^=]*\)=.*/\1/') + eval $REPLY + if [ $2 = "make" ]; then + eval echo "$var=\$$var" + else + eval echo "$var=\\\"\$$var\\\"" + fi + ;; + esac +done --- hotplug-0.0.20040329.orig/debian/compat +++ hotplug-0.0.20040329/debian/compat @@ -0,0 +1 @@ +4 --- hotplug-0.0.20040329.orig/debian/config +++ hotplug-0.0.20040329/debian/config @@ -0,0 +1,72 @@ +#!/bin/sh -e +# hotplug.config +# + +# source debconf library +. /usr/share/debconf/confmodule + +# this module use multiselect +db_capb multiselect + +KERNEL=`uname -r` + +case $KERNEL in + 2.2.*) MODULE_DIR=/lib/modules/$KERNEL ;; + *) MODULE_DIR=/lib/modules/$KERNEL/kernel/drivers;; +esac + +usbmodules= +test -d $MODULE_DIR/usb && + cd $MODULE_DIR/usb && + # get available usb modules + usbmodules=`find . -type f -name '*.ko' -o -name '*.o' | \ + sed -r -e 's,\.k?o$,,' -e 's,^.*/,,g' | \ + grep -v -E '^(usbcore|usb-uhci|uhci|usb-ohci)$' | \ + sort` + +isusbmodule() { + echo $usbmodules | grep -q "\<$1\>" +} + +if dpkg --compare-versions "$2" lt 0.0.20040329-4; then + # assume old behaviour + NET_AGENT_POLICY="hotplug" +fi +if grep -q '^mapping[[:space:]][[:space:]]*hotplug' /etc/network/interfaces; then + NET_AGENT_POLICY="hotplug" +fi + +test -f /etc/hotplug/usb.option && . /etc/hotplug/usb.option +test -f /etc/default/hotplug.usb && . /etc/default/hotplug.usb +test -f /etc/default/hotplug && . /etc/default/hotplug +if [ "$USE_NET_LIFACE" = "true" ]; then + NET_AGENT_POLICY="hotplug" +fi + +if test "$X11_USBMICE_HACK" != ""; then + db_set hotplug/x11_usbmice_hack "$X11_USBMICE_HACK" || true +fi +if test "$STATIC_MODULE_LIST" != ""; then + db_set hotplug/static_module_list $(echo "$STATIC_MODULE_LIST" | sed -e 's/ /, /g') || true +fi +if test "$NET_AGENT_POLICY" != ""; then + db_set hotplug/net_agent_policy "$NET_AGENT_POLICY" || true +fi +if test "$IGNORE_PCI_CLASS_DISPLAY" != ""; then + db_set hotplug/ignore_pci_class_display "$IGNORE_PCI_CLASS_DISPLAY" || true +fi + +db_go || true + +# if mousedev and/or input are module, then ask to load for X11 support +if isusbmodule mousedev || isusbmodule input; then + db_input high hotplug/x11_usbmice_hack || true + db_go || true +fi + +db_subst hotplug/static_module_list usbmodules $usbmodules +db_input low hotplug/static_module_list || true + +db_input low hotplug/net_agent_policy || true +db_input low hotplug/ignore_pci_class_display || true +db_go || true --- hotplug-0.0.20040329.orig/debian/hotplug.preinst +++ hotplug-0.0.20040329/debian/hotplug.preinst @@ -0,0 +1,58 @@ +#!/bin/sh -e + +remove_old_rc_links() { + [ "$2" ] || return + + if dpkg --compare-versions $2 lt 0.0.20040329-22; then + # Because of repeated errors in debian/rules, this file was installed + # in the wrong place. + if [ -d /etc/modprobe.d/isapnp/ ]; then + mv /etc/modprobe.d/isapnp/ /etc/modprobe.d/isapnp-backup/ + if [ -f /etc/modprobe.d/isapnp-backup/isapnp.aliases ]; then + # if old file didn't change, just remove it to avoid dpkg question + old_md5=`grep "^ /etc/modprobe.d/isapnp/isapnp.aliases" /var/lib/dpkg/status | sed -e "s/.* //"` + new_md5=`md5sum /etc/modprobe.d/isapnp-backup/isapnp.aliases | sed -e "s/ .*//"` + if [ "$old_md5" = "$new_md5" ]; then + rm /etc/modprobe.d/isapnp-backup/isapnp.aliases + else + mv /etc/modprobe.d/isapnp-backup/isapnp.aliases /etc/modprobe.d/isapnp + fi + fi + rmdir /etc/modprobe.d/isapnp-backup/ || true + fi + fi + if dpkg --compare-versions $2 lt 0.0.20040329-17; then + # stop scripts have been removed with 0.0.20040329-17 + rm -f /etc/rc?.d/K89hotplug + # and the flag file has been moved + if [ -e /etc/hotplug/net.enable ]; then + mkdir -p /etc/hotplug/.run/ + mv /etc/hotplug/net.enable /etc/hotplug/.run/ + fi + fi + if dpkg --compare-versions $2 lt 0.0.20040311-8; then + # These links are not needed anymore since 0.0.20040311-4, when support + # for /etc/nohotplug was removed and the script was moved from S36 to S40. + rm -f /etc/rc?.d/S11hotplug + if [ -h /etc/rcS.d/S36hotplug ]; then + mv /etc/rcS.d/S36hotplug /etc/rcS.d/S40hotplug + fi + fi +} + + +case "$1" in + install) + ;; + + upgrade|abort-upgrade) + remove_old_rc_links "$@" + ;; + + *) + echo "preinst called with unknown argument '$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- hotplug-0.0.20040329.orig/debian/README.Debian +++ hotplug-0.0.20040329/debian/README.Debian @@ -0,0 +1,96 @@ +hotplug for DEBIAN +---------------------- + +Hotplugging is a feature of Linux kernel whose goal is to let +you plug in new devices and use them immediately. That means that +you won't need to learn so much system administration; systems +will (hopefully, for the most part) be able to configure +themselves. + +For more information about Linux hotplug, visit + http://linux-hotplug.sourceforge.net/ + +You can check hotplug status by + # /etc/init.d/hotplug status + +Notes: + * USB keybord configuration + If you're booting with a USB keyboard and/or mouse, and want to defend + against boot failures like missing modules, you should probably use static + linking for the "hid", "keybdev" (and/or "mousedev"), "input", "usbcore", + and USB Host Controller modules. + + * Upstream's /etc/sysconfig/usb is moved to /etc/default/hotplug + which is automatically generated by hotplug on installation. + + configuration variables + STATIC_MODULE_LIST + (deprecated) modules that should be loaded at boot time. + use /etc/modules instead + X11_USBMICE_HACK + (deprecated) use USB mouse with X11? + use /etc/modules instead + NET_AGENT_POLICY + which network interfaces should be managed by hotplug? + all - all network interfaces in /etc/network/interfaces will be managed + by hotplug. + auto - network interfaces marked as "auto" in /etc/network/interfaces + will be managed by hotplug. + Thus, no-'auto' network interfaces will be ignored by hotplug. + hotplug - selected network interfaces by "mapping hotplug" stanzas in + /etc/network/interfaces will be managed by hotplug. + hotplug will try to bring up the interfaces with =hotplug, + e.g. ifup eth0=hotplug. + See below how to configure with this case. + IGNORE_PCI_CLASS_DISPLAY + ignore PCI_CLASS_DISPLAY_* devices? + HOTPLUG_RC_$SUBSYSTEM + If set to "no", disables coldplugging for the $SUBSYSTEM. + QUIET + If set, makes the init script much less verbose. + + * The message "usb** can't synthesize root hub events" means + either + - you don't have usbmodules, which is in usbutils package + (a package Recommended by hotplug) + or + - you don't have /proc/bus/usb/devices (CONFIG_USB_DEVICEFS) + + * Note that, in this case, user defined scripts for modules as + /etc/hotplug/usb/MODULENAME doesn't work. You must install + the usbutils package or use kernel with CONFIG_USB_DEVICEFS. + + * To recognize ieee1394, see http://www.linux1394.org/faq.php#hotplug + You'll need to put some script in /etc/hotplug.d/ieee1394/ + + * if you set NET_AGENT_POLICY=hotplug in /etc/default/hotplug, + /etc/hotplug/net.agent ifup's the hotplugged interface with + the logical interface name "hotplug". E.g., + ifup eth0=hotplug + Thus, if you use this option, hotplug does NOT ifup any network + interfaces unless the ifupdown package is configured appropriately. + + To ifup a network interface on hot plug, you must add the following + stanza to the /etc/network/interfaces file: + mapping hotplug + script echo + This stanza will cause all hot-plugged interfaces to be + ifupped. Note that you'll get the same results with 'all' option for + NET_AGENT_POLICY. + + If you want only SOME interfaces to be ifupped, you can use a stanza like + the following, with each iface you do want ifupped listed on a separate + "map" line. + mapping hotplug + script grep + map eth0 + map eth2 + Thus, hotplug will bring up only eth0 and eth2 with this example. + You can configure them independent of 'auto' network interfaces in + /etc/network/interfaces. + + These ideas came out of a discussion on the debian-devel mailing list. + http://lists.debian.org/debian-devel/2003/debian-devel-200303/msg00066.html + + -- Fumitoshi UKAI , Wed Oct 27 01:54:47 2004 + --- hotplug-0.0.20040329.orig/debian/hotplug.logcheck.violations.ignore +++ hotplug-0.0.20040329/debian/hotplug.logcheck.violations.ignore @@ -0,0 +1 @@ +net.agent: invoke if(up|down) --- hotplug-0.0.20040329.orig/debian/patches/055_which_by_command-v +++ hotplug-0.0.20040329/debian/patches/055_which_by_command-v @@ -0,0 +1,17 @@ +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/hotplug.functions hotplug-2004_03_29/etc/hotplug/hotplug.functions +--- hotplug-2004_03_29.orig/etc/hotplug/hotplug.functions 2004-10-27 03:41:23.000000000 +0900 ++++ hotplug-2004_03_29/etc/hotplug/hotplug.functions 2004-10-27 03:40:10.000000000 +0900 +@@ -66,6 +66,13 @@ + echo $(( 0 $(ls "$1" | sed -e 's/.*/+1/') )) + } + ++# provide which-like output when the real thing is not available ++if [ ! -x /usr/bin/which ]; then ++ which () { ++ command -v "$1" 2>/dev/null ++ } ++fi ++ + # + # Not "modprobe --autoclean" ... one driver module can handle many + # devices. Unloading should be done when no devices are present. --- hotplug-0.0.20040329.orig/debian/patches/pci_agent_direct +++ hotplug-0.0.20040329/debian/patches/pci_agent_direct @@ -0,0 +1,22 @@ +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/pci.rc hotplug-2004_03_29/etc/hotplug/pci.rc +--- hotplug-2004_03_29.orig/etc/hotplug/pci.rc 2004-06-06 18:26:37.000000000 +0200 ++++ hotplug-2004_03_29/etc/hotplug/pci.rc 2004-06-06 18:26:27.000000000 +0200 +@@ -25,8 +25,7 @@ + if [ -d /sys/bus ]; then + # 2.6 kernels + if [ -d /sys/bus/pci/devices/ ]; then +- cd /sys/bus/pci/devices/ +- for PCI_DEVICE in *; do ++ for PCI_DEVICE in /sys/bus/pci/devices/*; do + set `echo $PCI_DEVICE \ + | sed -e 's/\([^:]*\):\(.*\):\(.*\)\.\(.*\)/\1 \2 \3 \4/'` + PCI_SLOT_NAME=$2:$3.$4 +@@ -45,7 +44,7 @@ + continue;; + esac + fi +- /sbin/hotplug pci ++ ./pci.agent + done + fi + else --- hotplug-0.0.20040329.orig/debian/patches/011_hotplug.functions_quote_loaded +++ hotplug-0.0.20040329/debian/patches/011_hotplug.functions_quote_loaded @@ -0,0 +1,14 @@ +backport from upstream + +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/hotplug.functions hotplug-2004_03_29/etc/hotplug/hotplug.functions +--- hotplug-2004_03_29.orig/etc/hotplug/hotplug.functions 2004-04-02 01:25:22.000000000 +0900 ++++ hotplug-2004_03_29/etc/hotplug/hotplug.functions 2004-04-02 01:25:16.000000000 +0900 +@@ -176,7 +176,7 @@ + LOADED=true + fi + +- if [ $LOADED = false ]; then ++ if [ "$LOADED" = "false" ]; then + mesg "missing kernel or user mode driver $MODULE " + fi + if echo "$MODULE" | grep -q "usb-storage" > /dev/null 2>&1 ; then --- hotplug-0.0.20040329.orig/debian/patches/009_input.agent_ignore_no_bits +++ hotplug-0.0.20040329/debian/patches/009_input.agent_ignore_no_bits @@ -0,0 +1,17 @@ +some devices doesn't set all bits variables in /proc/bus/input/devices, but +input_map_modules() tries to match all bits, so posix shell may complains +to convert $((0x)) ($dev_bits may be empty) + +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/input.agent hotplug-2004_03_29/etc/hotplug/input.agent +--- hotplug-2004_03_29.orig/etc/hotplug/input.agent 2004-03-27 07:46:37.000000000 +0900 ++++ hotplug-2004_03_29/etc/hotplug/input.agent 2004-03-31 01:20:21.000000000 +0900 +@@ -115,6 +115,9 @@ + { + local mod_bits=$1 dev_bits=$2 + ++ if [ "$dev_bits" = "" ]; then ++ return 0 ++ fi + mword=$((0x${mod_bits##*:})) + dword=$((0x${dev_bits##*:})) + --- hotplug-0.0.20040329.orig/debian/patches/060_grepmap +++ hotplug-0.0.20040329/debian/patches/060_grepmap @@ -0,0 +1,137 @@ +diff -ruN hotplug-2004_03_29~/etc/hotplug/hotplug.functions hotplug-2004_03_29/etc/hotplug/hotplug.functions +--- hotplug-2004_03_29~/etc/hotplug/hotplug.functions 2004-10-31 16:20:05.000000000 +0000 ++++ hotplug-2004_03_29/etc/hotplug/hotplug.functions 2004-11-01 11:01:42.901449544 +0000 +@@ -120,9 +120,13 @@ + esac + fi + +- # try parsing by shell scripts if no luck yet ++ # try parsing by grepmap or shell scripts if no luck yet + if [ "$DRIVERS" = "" ]; then +- ${TYPE}_map_modules < $FILENAME ++ if [ -x /sbin/grepmap -a -n "$GREPMAP_ARGS" ]; then ++ DRIVERS=`/sbin/grepmap --${TYPE}map --file=$FILENAME $GREPMAP_ARGS` ++ else ++ ${TYPE}_map_modules < $FILENAME ++ fi + fi + + # FIXME remove dups and blacklisted modules from $DRIVERS here +diff -ruN hotplug-2004_03_29~/etc/hotplug/ieee1394.agent hotplug-2004_03_29/etc/hotplug/ieee1394.agent +--- hotplug-2004_03_29~/etc/hotplug/ieee1394.agent 2004-10-31 16:20:04.000000000 +0000 ++++ hotplug-2004_03_29/etc/hotplug/ieee1394.agent 2004-11-01 10:49:39.521420024 +0000 +@@ -45,6 +45,7 @@ + device_vendor_id=$((0x$VENDOR_ID)) + device_specifier_id=$((0x$SPECIFIER_ID)) + device_version=$((0x$VERSION)) ++GREPMAP_ARGS="0x$VENDOR_ID 0x$SPECIFIER_ID 0x$VERSION" + + MATCH_VENDOR_ID=0x0001 + MATCH_SPECIFIER_ID=0x0004 +diff -ruN hotplug-2004_03_29~/etc/hotplug/input.agent hotplug-2004_03_29/etc/hotplug/input.agent +--- hotplug-2004_03_29~/etc/hotplug/input.agent 2004-10-31 16:20:03.000000000 +0000 ++++ hotplug-2004_03_29/etc/hotplug/input.agent 2004-11-01 11:01:00.896835216 +0000 +@@ -82,10 +82,16 @@ + i_vendor=$((0x$2)) + i_product=$((0x$3)) + i_version=$((0x$4)) ++ GREPMAP_ARGS="0x$1 0x$2 0x$3 0x$4" ++ else ++ GREPMAP_ARGS="0 0 0 0" + fi + + if [ "$EV" != "" ]; then + i_evBits=$((0x$EV)) ++ GREPMAP_ARGS="$GREPMAP_ARGS 0x$EV" ++ else ++ GREPMAP_ARGS="$GREPMAP_ARGS 0" + fi + + input_join_words i_keyBits "$KEY" +@@ -95,6 +101,7 @@ + input_join_words i_ledBits "$LED" + input_join_words i_sndBits "$SND" + input_join_words i_ffBits "$FF" ++ GREPMAP_ARGS="$GREPMAP_ARGS ${i_keyBits:-0} ${i_relBits:-0} ${i_absBits:-0} ${i_mscBits:-0} ${i_ledBits:-0} ${i_sndBits:-0} ${i_ffBits:-0}" + } + + INPUT_DEVICE_ID_MATCH_BUS=1 +diff -ruN hotplug-2004_03_29~/etc/hotplug/pci.agent hotplug-2004_03_29/etc/hotplug/pci.agent +--- hotplug-2004_03_29~/etc/hotplug/pci.agent 2004-10-31 16:20:03.000000000 +0000 ++++ hotplug-2004_03_29/etc/hotplug/pci.agent 2004-11-01 10:49:15.004147216 +0000 +@@ -64,10 +64,12 @@ + set $(echo $PCI_ID | sed -e 's/\([^:]*\):\(.*\)/\1 \2/') + pci_id_vendor=$((0x$1)) + pci_id_device=$((0x$2)) ++ GREPMAP_ARGS="0x$1 0x$2" + + set $(echo $PCI_SUBSYS_ID | sed -e 's/\([^:]*\):\(.*\)/\1 \2/') + pci_subid_vendor=$((0x$1)) + pci_subid_device=$((0x$2)) ++ GREPMAP_ARGS="$GREPMAP_ARGS 0x$1 0x$2 0x$PCI_CLASS" + } + + PCI_ANY=$((0xffffffff)) +diff -ruN hotplug-2004_03_29~/etc/hotplug/usb.agent hotplug-2004_03_29/etc/hotplug/usb.agent +--- hotplug-2004_03_29~/etc/hotplug/usb.agent 2004-10-31 16:20:04.000000000 +0000 ++++ hotplug-2004_03_29/etc/hotplug/usb.agent 2004-11-01 11:00:06.474108728 +0000 +@@ -183,6 +183,7 @@ + usb_idVendor=$((0x$1)) + usb_idProduct=$((0x$2)) + usb_bcdDevice=$((0x$3)) ++ GREPMAP_ARGS="0x$1 0x$2 0x$3" + + if [ "$TYPE" != "" ]; then + IFS=/ +@@ -190,16 +191,22 @@ + usb_bDeviceClass=$1 + usb_bDeviceSubClass=$2 + usb_bDeviceProtocol=$3 ++ GREPMAP_ARGS="$GREPMAP_ARGS $(printf "0x%x 0x%x 0x%x" $1 $2 $3)" + IFS="$DEFAULT_IFS" + elif [ -r $SYSFS/$DEVPATH/bDeviceClass ]; then +- usb_bDeviceClass=$((0x$(cat $SYSFS/$DEVPATH/bDeviceClass))) +- usb_bDeviceSubClass=$((0x$(cat $SYSFS/$DEVPATH/bDeviceSubClass))) +- usb_bDeviceProtocol=$((0x$(cat $SYSFS/$DEVPATH/bDeviceProtocol))) ++ _bDeviceClass="0x$(cat $SYSFS/$DEVPATH/bDeviceClass)" ++ _bDeviceSubClass="0x$(cat $SYSFS/$DEVPATH/bDeviceSubClass)" ++ _bDeviceProtocol="0x$(cat $SYSFS/$DEVPATH/bDeviceProtocol)" ++ usb_bDeviceClass=$(($_bDeviceClass)) ++ usb_bDeviceSubClass=$(($_bDeviceSubClass)) ++ usb_bDeviceProtocol=$(($_bDeviceProtocol)) ++ GREPMAP_ARGS="$GREPMAP_ARGS $_bDeviceClass $_bDeviceSubClass $_bDeviceProtocol" + else + # out-of-range values + usb_bDeviceClass=1000 + usb_bDeviceSubClass=1000 + usb_bDeviceProtocol=1000 ++ GREPMAP_ARGS="$GREPMAP_ARGS 0xffff 0xffff 0xffff" + fi + + if [ "$INTERFACE" != "" ]; then +@@ -208,16 +215,22 @@ + usb_bInterfaceClass=$1 + usb_bInterfaceSubClass=$2 + usb_bInterfaceProtocol=$3 ++ GREPMAP_ARGS="$GREPMAP_ARGS $(printf "0x%x 0x%x 0x%x" $1 $2 $3)" + IFS="$DEFAULT_IFS" + elif [ -r $SYSFS/$DEVPATH/bInterfaceClass ]; then +- usb_bInterfaceClass=$((0x$(cat $SYSFS/$DEVPATH/bInterfaceClass))) +- usb_bInterfaceSubClass=$((0x$(cat $SYSFS/$DEVPATH/bInterfaceSubClass))) +- usb_bInterfaceProtocol=$((0x$(cat $SYSFS/$DEVPATH/bInterfaceProtocol))) ++ _bInterfaceClass="0x$(cat $SYSFS/$DEVPATH/bInterfaceClass)" ++ _bInterfaceSubClass="0x$(cat $SYSFS/$DEVPATH/bInterfaceSubClass)" ++ _bInterfaceProtocol="0x$(cat $SYSFS/$DEVPATH/bInterfaceProtocol)" ++ usb_bInterfaceClass=$(($_bInterfaceClass)) ++ usb_bInterfaceSubClass=$(($_bInterfaceSubClass)) ++ usb_bInterfaceProtocol=$(($_bInterfaceProtocol)) ++ GREPMAP_ARGS="$GREPMAP_ARGS $_bInterfaceClass $_bInterfaceSubClass $_bInterfaceProtocol" + else + # out-of-range values + usb_bInterfaceClass=1000 + usb_bInterfaceSubClass=1000 + usb_bInterfaceProtocol=1000 ++ GREPMAP_ARGS="$GREPMAP_ARGS 0xffff 0xffff 0xffff" + fi + } + --- hotplug-0.0.20040329.orig/debian/patches/051_net.agent_ifrename_-t +++ hotplug-0.0.20040329/debian/patches/051_net.agent_ifrename_-t @@ -0,0 +1,12 @@ +diff -ruNp hotplug-2004_03_29.orig/etc/hotplug/net.agent hotplug-2004_03_29/etc/hotplug/net.agent +--- hotplug-2004_03_29.orig/etc/hotplug/net.agent 2005-08-18 02:26:49.890674000 +0100 ++++ hotplug-2004_03_29/etc/hotplug/net.agent 2005-08-18 02:28:03.632463824 +0100 +@@ -57,7 +57,7 @@ add|register) + # down to change its name. + if [ -x /sbin/ifrename ] && [ -r /etc/iftab ]; then + debug_mesg invoke ifrename for $INTERFACE +- NEWNAME=`/sbin/ifrename -i $INTERFACE` ++ NEWNAME=`/sbin/ifrename -t -i $INTERFACE` + if [ -n "$NEWNAME" ]; then + debug_mesg iface $INTERFACE is remapped to $NEWNAME + INTERFACE=$NEWNAME --- hotplug-0.0.20040329.orig/debian/patches/011_usb.rc_dont_force_hcds +++ hotplug-0.0.20040329/debian/patches/011_usb.rc_dont_force_hcds @@ -0,0 +1,59 @@ +Fixes #237177: + +The hotplug script will automatically load ehci-hcd on startup even +though it's listed in /etc/hotplug/blacklist. + + +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/usb.rc hotplug-2004_03_29/etc/hotplug/usb.rc +--- hotplug-2004_03_29.orig/etc/hotplug/usb.rc 2005-02-14 17:51:58.000000000 +0100 ++++ hotplug-2004_03_29/etc/hotplug/usb.rc 2005-02-14 17:51:50.000000000 +0100 +@@ -116,6 +116,13 @@ + fi + } + ++maybe_modprobe () ++{ ++ MODULE=$1 ++ if ! is_blacklisted $MODULE; then ++ modprobe -q $MODULE ++ fi ++} + + maybe_start_usb () + { +@@ -157,6 +164,12 @@ + fi + fi + ++ # If boot time synthesis works, we can assume that pci.rc will have ++ # already loaded the drivers needed by the system HCDs. ++ # FIXME: should test -x pci.rc ? ++ if [ "$SYNTHESIZE" = false ] || [ ! -f /proc/bus/usb/devices ] \ ++ || ! grep -q -i bus /proc/bus/usb/devices; then ++ + # Load Host Controller Drivers (HCDs) ... this automatically handles + # systems with multiple controllers (EHCI, OHCI, UHCI) without needing + # /proc or tools (lspci -v|grep USB, etc) to do so. If hotplugging +@@ -167,15 +180,17 @@ + # the blacklist control which uhci driver gets used (before 2.5). + + # "new style" HCDs ... more common code +- modprobe -q ehci-hcd >/dev/null 2>&1 +- modprobe -q ohci-hcd >/dev/null 2>&1 +- modprobe -q uhci-hcd >/dev/null 2>&1 ++ maybe_modprobe ehci-hcd >/dev/null 2>&1 ++ maybe_modprobe ohci-hcd >/dev/null 2>&1 ++ maybe_modprobe uhci-hcd >/dev/null 2>&1 + + # "old style" HCDs ... more driver-specific bugs +- modprobe -q usb-ohci >/dev/null 2>&1 ++ maybe_modprobe usb-ohci >/dev/null 2>&1 + # NOTE: this prefers "uhci"; you may prefer "usb-uhci". + # modprobe -q usb-uhci >/dev/null 2>&1 || modprobe -q uhci >/dev/null 2>&1 +- modprobe -q uhci >/dev/null 2>&1 || modprobe -q usb-uhci >/dev/null 2>&1 ++ maybe_modprobe uhci >/dev/null 2>&1 || modprobe -q usb-uhci >/dev/null 2>&1 ++ ++ fi # end of "$SYNTHESIZE" = false + + # ... add any non-PCI HCDS here. Examples include the + # CRIS usb-host, Philips ISP-1161, Symlogic 811HS, and so on. --- hotplug-0.0.20040329.orig/debian/patches/sbin_hotplug_cleanup +++ hotplug-0.0.20040329/debian/patches/sbin_hotplug_cleanup @@ -0,0 +1,18 @@ +The -f test is implied by the -x test. +I see no reason to exit with rc=1. + +diff -ruN hotplug-2004_03_11.orig/sbin/hotplug hotplug-2004_03_11/sbin/hotplug +--- hotplug-2004_03_11.orig/sbin/hotplug 2003-09-24 22:27:42.000000000 +0200 ++++ hotplug-2004_03_11/sbin/hotplug 2004-03-13 14:16:49.000000000 +0100 +@@ -28,9 +28,7 @@ + DIR="/etc/hotplug.d" + + for I in "${DIR}/$1/"*.hotplug "${DIR}/"default/*.hotplug ; do +- if [ -f $I ]; then +- test -x $I && $I $1 ; +- fi ++ test -x "$I" && "$I" "$1" + done + +-exit 1 ++exit 0 --- hotplug-0.0.20040329.orig/debian/patches/firmware_versions +++ hotplug-0.0.20040329/debian/patches/firmware_versions @@ -0,0 +1,43 @@ +--- hotplug-2004_03_29.orig/etc/hotplug/firmware.agent.orig 2004-08-29 13:29:58.000000000 +1000 ++++ hotplug-2004_03_29/etc/hotplug/firmware.agent 2004-08-29 13:33:11.000000000 +1000 +@@ -17,6 +17,14 @@ + + cd /etc/hotplug + . ./hotplug.functions ++ ++load() { ++ echo 1 > $SYSFS/$DEVPATH/loading ++ cat "$1" > $SYSFS/$DEVPATH/data ++ echo 0 > $SYSFS/$DEVPATH/loading ++ exit ++} ++ + # DEBUG=yes export DEBUG + + # directories with the firmware files +@@ -30,6 +38,8 @@ + SYSFS=/proc + fi + ++VERSION=$(uname -r) ++ + # + # What to do with this firmware hotplug event? + # +@@ -41,11 +51,11 @@ + fi + + for DIR in $FIRMWARE_DIRS; do +- [ -e "$DIR/$FIRMWARE" ] || continue +- echo 1 > $SYSFS/$DEVPATH/loading +- cat "$DIR/$FIRMWARE" > $SYSFS/$DEVPATH/data +- echo 0 > $SYSFS/$DEVPATH/loading +- exit ++ if [ -e "$DIR/$FIRMWARE-$VERSION" ]; then ++ load "$DIR/$FIRMWARE-$VERSION" ++ elif [ -e "$DIR/$FIRMWARE" ]; then ++ load "$DIR/$FIRMWARE" ++ fi + done + + # the firmware was not found --- hotplug-0.0.20040329.orig/debian/patches/91blacklist-eth1394 +++ hotplug-0.0.20040329/debian/patches/91blacklist-eth1394 @@ -0,0 +1,9 @@ +diff -ru hotplug-2004_03_29.old/etc/hotplug/blacklist hotplug-2004_03_29/etc/hotplug/blacklist +--- hotplug-2004_03_29.old/etc/hotplug/blacklist 2004-09-01 09:49:26.000000000 -0700 ++++ hotplug-2004_03_29/etc/hotplug/blacklist 2004-09-01 09:50:47.000000000 -0700 +@@ -51,3 +51,5 @@ + wdt + wdt_pci + ++# causes no end of confusion by creating unexpected network interfaces ++eth1394 --- hotplug-0.0.20040329.orig/debian/patches/005_defaults_file_path +++ hotplug-0.0.20040329/debian/patches/005_defaults_file_path @@ -0,0 +1,42 @@ +diff -ruN hotplug-2004_01_05.orig/etc/hotplug/hotplug.functions hotplug-2004_01_05/etc/hotplug/hotplug.functions +--- hotplug-2004_01_05.orig/etc/hotplug/hotplug.functions 2004-02-01 19:09:39.000000000 +0100 ++++ hotplug-2004_01_05/etc/hotplug/hotplug.functions 2004-02-01 19:09:33.000000000 +0100 +@@ -18,8 +18,8 @@ + + HOTPLUG_DIR=/etc/hotplug + +-if [ -f /etc/sysconfig/hotplug ]; then +- . /etc/sysconfig/hotplug ++if [ -f /etc/default/hotplug ]; then ++ . /etc/default/hotplug + fi + + if [ -x /usr/bin/logger ]; then +diff -ruN hotplug-2004_01_05.orig/etc/hotplug/usb.agent hotplug-2004_01_05/etc/hotplug/usb.agent +--- hotplug-2004_01_05.orig/etc/hotplug/usb.agent 2004-02-01 19:09:39.000000000 +0100 ++++ hotplug-2004_01_05/etc/hotplug/usb.agent 2004-02-01 19:08:56.000000000 +0100 +@@ -74,8 +74,8 @@ + # $Id: usb.agent,v 1.35 2003/10/13 23:52:54 kroah Exp $ + # + +-if [ -f /etc/sysconfig/usb ]; then +- . /etc/sysconfig/usb ++if [ -f /etc/default/hotplug ]; then ++ . /etc/default/hotplug + fi + + cd /etc/hotplug +diff -ruN hotplug-2004_01_05.orig/etc/hotplug/usb.rc hotplug-2004_01_05/etc/hotplug/usb.rc +--- hotplug-2004_01_05.orig/etc/hotplug/usb.rc 2004-02-01 19:09:39.000000000 +0100 ++++ hotplug-2004_01_05/etc/hotplug/usb.rc 2004-02-01 19:09:08.000000000 +0100 +@@ -28,8 +28,8 @@ + X11_USBMICE_HACK=false + + # override any of the defaults above? +-if [ -f /etc/sysconfig/usb ]; then +- . /etc/sysconfig/usb ++if [ -f /etc/default/hotplug ]; then ++ . /etc/default/hotplug + fi + + --- hotplug-0.0.20040329.orig/debian/patches/008_usb.agent_empty_lines +++ hotplug-0.0.20040329/debian/patches/008_usb.agent_empty_lines @@ -0,0 +1,14 @@ +Do not spew annoying messages for each empty line in maps files. +This fixes #221739. + +diff -ruN hotplug-2004_01_05.orig/etc/hotplug/usb.agent hotplug-2004_01_05/etc/hotplug/usb.agent +--- hotplug-2004_01_05.orig/etc/hotplug/usb.agent 2004-03-12 00:28:26.000000000 +0100 ++++ hotplug-2004_01_05/etc/hotplug/usb.agent 2004-03-12 00:28:16.000000000 +0100 +@@ -248,6 +248,7 @@ + # be careful, they still get parsed by bash! + case "$line" in + \#*) continue ;; ++ "") continue ;; + esac + + set $line --- hotplug-0.0.20040329.orig/debian/patches/006_env_replacement +++ hotplug-0.0.20040329/debian/patches/006_env_replacement @@ -0,0 +1,17 @@ +diff -ruN hotplug-2004_01_05.orig/etc/hotplug/hotplug.functions hotplug-2004_01_05/etc/hotplug/hotplug.functions +--- hotplug-2004_01_05.orig/etc/hotplug/hotplug.functions 2004-03-12 00:45:15.000000000 +0100 ++++ hotplug-2004_01_05/etc/hotplug/hotplug.functions 2004-03-12 00:44:32.000000000 +0100 +@@ -47,6 +47,13 @@ + mesg "$@" + } + ++# provide env-like output when the real thing is not available ++if [ ! -x /usr/bin/env ]; then ++ env () { ++ # bash prepends "declare -x " at the beginning of each line ++ export -p | sed -e 's/^declare -x //' ++ } ++fi + + # + # Not "modprobe --autoclean" ... one driver module can handle many --- hotplug-0.0.20040329.orig/debian/patches/scsi.agent_cleanup +++ hotplug-0.0.20040329/debian/patches/scsi.agent_cleanup @@ -0,0 +1,64 @@ +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/scsi.agent hotplug-2004_03_29/etc/hotplug/scsi.agent +--- hotplug-2004_03_29.orig/etc/hotplug/scsi.agent 2004-03-27 00:08:48.000000000 +0100 ++++ hotplug-2004_03_29/etc/hotplug/scsi.agent 2005-03-19 21:00:16.000000000 +0100 +@@ -12,12 +12,6 @@ + case $ACTION in + + add) +- # 2.5.50 kernel bug: this happens sometimes +- if [ ! -d /sys/$DEVPATH ]; then +- mesg "bogus sysfs DEVPATH=$DEVPATH" +- exit 1 +- fi +- + TYPE_ATTR=/sys$DEVPATH/type + + # Possibly sleep here to try and avoid races with scsi attributes and block +@@ -37,28 +31,34 @@ + exit 1 + fi + +- TYPE=$(cat $TYPE_ATTR) ++ read TYPE < $TYPE_ATTR + case "$TYPE" in + # 2.5.51 style attributes; TYPE_* constants +- 0) TYPE=disk ; MODULE=sd_mod ;; ++ 0) TYPE=disk ; MODULES=sd_mod ;; + # FIXME some tapes use 'osst' not 'st' +- 1) TYPE=tape ; MODULE=st ;; ++ 1) TYPE=tape ; MODULES=st ;; + 2) TYPE=printer ;; + 3) TYPE=processor ;; +- 4) TYPE=worm ; MODULE=sr_mod ;; +- 5) TYPE=cdrom ; MODULE=sr_mod ;; +- 6) TYPE=scanner ;; +- 7) TYPE=mod ; MODULE=sd_mod ;; ++ 4) TYPE=worm ; MODULES=sr_mod ;; ++ 5) TYPE=cdrom ; MODULES="sr_mod sg" ;; ++ 6) TYPE=scanner ; MODULES=sg ;; ++ 7) TYPE=mod ; MODULES=sd_mod ;; + 8) TYPE=changer ;; + 9) TYPE=comm ;; + 14) TYPE=enclosure ;; + esac +- if [ "$MODULE" != "" ]; then +- mesg "$TYPE at $DEVPATH" +- modprobe $MODULE +- else +- debug_mesg "how to add device type=$TYPE at $DEVPATH ??" +- fi ++ for MODULE in $MODULES; do ++ if is_blacklisted $MODULE; then ++ mesg " $MODULE: blacklisted (for $TYPE)" ++ elif modprobe --quiet $MODULE; then ++ mesg " $MODULE: loaded sucessfully (for $TYPE)" ++ else ++ mesg " $MODULE: can't be loaded (for $TYPE)" ++ fi ++ done ++ ;; ++ ++remove) + ;; + + *) --- hotplug-0.0.20040329.orig/debian/patches/012_pci.rc_return_value +++ hotplug-0.0.20040329/debian/patches/012_pci.rc_return_value @@ -0,0 +1,14 @@ +backport from upstream + +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/pci.rc hotplug-2004_03_29/etc/hotplug/pci.rc +--- hotplug-2004_03_29.orig/etc/hotplug/pci.rc 2004-04-02 01:29:39.000000000 +0900 ++++ hotplug-2004_03_29/etc/hotplug/pci.rc 2004-04-02 01:29:23.000000000 +0900 +@@ -46,7 +46,7 @@ + LISTER=`which pcimodules` + if [ "$LISTER" = "" -o ! -f /proc/bus/pci/devices -o ! -x pci.agent ]; then + echo "** can't synthesize pci hotplug events" +- return ++ return 1 + fi + + # these notifications will be handled by pcimodules --- hotplug-0.0.20040329.orig/debian/patches/000_remove_gettext +++ hotplug-0.0.20040329/debian/patches/000_remove_gettext @@ -0,0 +1,155 @@ +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/input.rc hotplug-2004_03_29/etc/hotplug/input.rc +--- hotplug-2004_03_29.orig/etc/hotplug/input.rc 2004-03-27 07:34:34.000000000 +0900 ++++ hotplug-2004_03_29/etc/hotplug/input.rc 2004-03-31 00:47:39.000000000 +0900 +@@ -54,7 +54,7 @@ + [ -d $PROCDIR ] || return + + if [ ! -r $PROCDIR/devices ]; then +- echo $"** can't synthesize input events - $PROCDIR/devices missing" ++ echo "** can't synthesize input events - $PROCDIR/devices missing" + return + fi + +@@ -119,7 +119,7 @@ + : not supported currently + ;; + status) +- echo $"INPUT status for kernel: " `uname -srm` ++ echo "INPUT status for kernel: " `uname -srm` + echo '' + + echo "INPUT devices:" +@@ -145,6 +145,6 @@ + $0 stop && $0 start + ;; + *) +- echo $"Usage: $0 {start|stop|status|restart}" ++ echo "Usage: $0 {start|stop|status|restart}" + exit 1 + esac +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/pci.rc hotplug-2004_03_29/etc/hotplug/pci.rc +--- hotplug-2004_03_29.orig/etc/hotplug/pci.rc 2004-03-27 07:34:24.000000000 +0900 ++++ hotplug-2004_03_29/etc/hotplug/pci.rc 2004-03-31 00:47:58.000000000 +0900 +@@ -45,7 +45,7 @@ + # 2.4 kernels + LISTER=`which pcimodules` + if [ "$LISTER" = "" -o ! -f /proc/bus/pci/devices -o ! -x pci.agent ]; then +- echo $"** can't synthesize pci hotplug events" ++ echo "** can't synthesize pci hotplug events" + return + fi + +@@ -67,26 +67,26 @@ + pci_boot_events + ;; + stop) +- # echo $"pci stop -- ignored" ++ # echo "pci stop -- ignored" + ;; + status) +- echo $"PCI Status for kernel: " `uname -srm` ++ echo "PCI Status for kernel: " `uname -srm` + echo '' + + if [ -f /proc/bus/pci/devices ]; then + COUNT=`ls /proc/bus/pci | wc -l` + if [ $COUNT -gt 1 ]; then + COUNT=`expr $COUNT - 1` +- echo $"PCI up; bus count is $COUNT" ++ echo "PCI up; bus count is $COUNT" + if [ -x /sbin/lspci ]; then + /sbin/lspci + fi + else +- echo $"no PCI busses?" ++ echo "no PCI busses?" + fi + echo '' + else +- echo $"no PCI /proc support?" ++ echo "no PCI /proc support?" + fi + echo '' + +@@ -96,6 +96,6 @@ + $0 stop && $0 start + ;; + *) +- echo $"Usage: $0 {start|stop|status|restart}" ++ echo "Usage: $0 {start|stop|status|restart}" + exit 1 + esac +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/usb.rc hotplug-2004_03_29/etc/hotplug/usb.rc +--- hotplug-2004_03_29.orig/etc/hotplug/usb.rc 2004-03-30 04:34:30.000000000 +0900 ++++ hotplug-2004_03_29/etc/hotplug/usb.rc 2004-03-31 00:48:32.000000000 +0900 +@@ -73,7 +73,7 @@ + # we need (non-bash) programs to parse descriptors. + LISTER=`which usbmodules` + if [ "$LISTER" = "" -o ! -f /proc/bus/usb/devices ]; then +- echo $"** can't synthesize root hub events" ++ echo "** can't synthesize root hub events" + return + fi + +@@ -331,7 +331,7 @@ + maybe_stop_usb + ;; + status) +- echo $"USB Status for kernel: " `uname -srm` ++ echo "USB Status for kernel: " `uname -srm` + echo '' + + if [ -f /proc/bus/usb/devices ]; then +@@ -340,14 +340,14 @@ + COUNT=`ls /proc/bus/usb | wc -l` + if [ $COUNT -ge 2 ]; then + COUNT=`expr $COUNT - 2` +- echo $"USB up; bus count is $COUNT" ++ echo "USB up; bus count is $COUNT" + grep "^[TPSI]:" /proc/bus/usb/devices + else +- echo $"usbfs partially up; no busses" ++ echo "usbfs partially up; no busses" + fi + echo '' + +- echo $"USB Drivers Loaded: " ++ echo "USB Drivers Loaded: " + if [ -f /proc/bus/usb/drivers ]; then + cat /proc/bus/usb/drivers + fi +@@ -355,20 +355,20 @@ + ls -1 /sys/bus/usb/drivers + fi + else +- echo $"usbfs is unavailable. " ++ echo "usbfs is unavailable. " + if [ -f /proc/modules ] && fgrep -q usbcore /proc/modules; then +- echo $"USB module is loaded. " ++ echo "USB module is loaded. " + else +- echo $"USB may be statically linked. " ++ echo "USB may be statically linked. " + fi +- echo $"If khubd is running, that shows USB is available." ++ echo "If khubd is running, that shows USB is available." + fi + echo '' + + if [ -f /proc/sys/kernel/hotplug ]; then +- echo $"khubd/hotplug thread: " ++ echo "khubd/hotplug thread: " + else +- echo $"khubd thread:" ++ echo "khubd thread:" + fi + ps -l | head -1 + ps -Al | egrep 'khubd' | grep -v grep +@@ -385,6 +385,6 @@ + $0 stop && $0 start + ;; + *) +- echo $"Usage: $0 {start|stop|status|restart}" ++ echo "Usage: $0 {start|stop|status|restart}" + exit 1 + esac --- hotplug-0.0.20040329.orig/debian/patches/017_pci.rc_pcimodules_once +++ hotplug-0.0.20040329/debian/patches/017_pci.rc_pcimodules_once @@ -0,0 +1,30 @@ +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/pci.rc hotplug-2004_03_29/etc/hotplug/pci.rc +--- hotplug-2004_03_29.orig/etc/hotplug/pci.rc 2004-07-17 21:38:45.000000000 +0200 ++++ hotplug-2004_03_29/etc/hotplug/pci.rc 2004-07-17 21:38:40.000000000 +0200 +@@ -17,10 +17,9 @@ + ACTION=add + PCI_CLASS=0 + PCI_ID=0:0 +- PCI_SLOT=0:0.0 + PCI_SLOT_NAME=0:0.0 + PCI_SUBSYS_ID=0:0 +- export ACTION PCI_CLASS PCI_ID PCI_SLOT PCI_SLOT_NAME PCI_SUBSYS_ID ++ export ACTION PCI_CLASS PCI_ID PCI_SLOT_NAME PCI_SUBSYS_ID + + if [ -d /sys/bus ]; then + # 2.6 kernels +@@ -56,12 +55,8 @@ + fi + + # these notifications will be handled by pcimodules +- for BUS in `cd /proc/bus/pci;find * -type d -print`; do +- for SLOT_FUNC in `cd /proc/bus/pci/$BUS; echo *`; do +- PCI_SLOT=$BUS:$SLOT_FUNC +- /sbin/hotplug pci +- done +- done ++ # a single pcimodules invocation will report the modules for all slots ++ ./pci.agent + fi + + return 0 --- hotplug-0.0.20040329.orig/debian/patches/94blacklist3-intel8x0m +++ hotplug-0.0.20040329/debian/patches/94blacklist3-intel8x0m @@ -0,0 +1,11 @@ +diff -ru build-tree.orig/hotplug-2004_03_29/etc/hotplug/blacklist build-tree/hotplug-2004_03_29/etc/hotplug/blacklist +--- hotplug-2004_03_29/etc/hotplug/blacklist 2005-03-10 10:52:36.779570000 -0800 ++++ hotplug-2004_03_29/etc/hotplug/blacklist 2005-03-10 10:54:06.133986184 -0800 +@@ -57,3 +57,7 @@ + + # eepro100 is obsoleted by e100 (Ubuntu bug #2156) + eepro100 ++ ++# snd_intel8x0m can interfere with snd_intel8x0, doesn't seem to support much ++# hardware on its own (Ubuntu bug #2011, #6810) ++snd_intel8x0m --- hotplug-0.0.20040329.orig/debian/patches/zzz_001_sata_vim +++ hotplug-0.0.20040329/debian/patches/zzz_001_sata_vim @@ -0,0 +1,30 @@ +--- /etc/hotplug/pci.rc.old 2005-03-15 19:26:36.664237672 -0500 ++++ /etc/hotplug/pci.rc 2005-03-15 19:32:58.308218968 -0500 +@@ -36,6 +36,12 @@ + sub_vendor_id=`cat $PCI_DEVICE/subsystem_vendor` + sub_device_id=`cat $PCI_DEVICE/subsystem_device` + PCI_SUBSYS_ID="${sub_vendor_id#0x}:${sub_device_id#0x}" ++ # We do this here to work around a bug in the sata_via ++ # chipset. It requires ide-generic be loaded, but ++ # there's never a hint to hotplug to do so. ++ if [ "${PCI_ID}" = "1106:3149" ]; then ++ LOAD_IDE_GENERIC=y ++ fi + # FIXME: more generic way? + if [ "$IGNORE_PCI_CLASS_DISPLAY" = "true" ]; then + case "$PCI_CLASS" in +@@ -44,6 +50,14 @@ + esac + fi + ./pci.agent + done ++ if [ "z${LOAD_IDE_GENERIC}" = "zy" ]; then ++ MODULE=ide-generic ++ if modprobe --quiet $MODULE; then ++ mesg " $MODULE: loaded sucessfully" ++ else ++ mesg " $MODULE: can't be loaded" ++ fi ++ fi + fi + else --- hotplug-0.0.20040329.orig/debian/patches/012_usb.rc_fix_coldplugging +++ hotplug-0.0.20040329/debian/patches/012_usb.rc_fix_coldplugging @@ -0,0 +1,129 @@ +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/usb.rc hotplug-2004_03_29/etc/hotplug/usb.rc +--- hotplug-2004_03_29.orig/etc/hotplug/usb.rc 2005-02-14 21:04:37.000000000 +0100 ++++ hotplug-2004_03_29/etc/hotplug/usb.rc 2005-02-14 21:04:19.000000000 +0100 +@@ -21,6 +21,8 @@ + + PATH=/sbin:/bin:/usr/sbin:/usr/bin + ++cd /etc/hotplug/ ++ + unset I_WANT_A_BROKEN_PS + PS_PERSONALITY=linux + +@@ -58,25 +60,6 @@ + # + usb_boot_events () + { +- # +- # FIXME on 2.5, /sys/bus/usb/devices/* gives all of the +- # info we need. Interface hotplug events come from the +- # "*:*" files, and device events (do them first) come +- # from the others. +- # +- # don't expect usbmodules to exist!! and remove the +- # dependency (below) on usbfs to decide whether we should +- # be synthesizing coldplug events. +- # +- +- # synthesize hotplug events if we can +- # we need (non-bash) programs to parse descriptors. +- LISTER=`which usbmodules` +- if [ "$LISTER" = "" -o ! -f /proc/bus/usb/devices ]; then +- echo "** can't synthesize root hub events" +- return +- fi +- + # make sure the usb agent will run + ACTION=add + PRODUCT=0/0/0 +@@ -87,6 +70,7 @@ + DEVICE= + export ACTION PRODUCT TYPE INTERFACE DEVPATH DEVFS DEVICE + ++ # for 2.4 kernels + # these notifications will be handled by usbmodules + # NOTE: we're not providing a full set of hotplug + # parameters for USB. that's why "usbmodules" is a +@@ -96,24 +80,69 @@ + # FIXME usbmodules, or something, should set real + # PRODUCT and DEVICE strings so /etc/hotplug/usb/* + # scripts can rely on them ... +- # FIXME: this comment is out of date. +- if [ -d /sys/bus ]; then +- if [ -d /sys/bus/usb/devices ]; then +- cd /sys/bus/usb/devices +- # XXX FIXME this is not the right way... +- for device in /sys/bus/usb/devices/[0-9]*; do +- DEVPATH=${device#/sys/} +- if [ -f $device/idVendor ]; then +- PRODUCT="$(cat $device/idVendor)/$(cat $device/idProduct)/$(cat $device/bcdDevice)" +- /etc/hotplug/usb.agent +- fi +- done ++ if [ ! -d /sys/bus/ ]; then ++ # on 2.4 kernels we need (non-bash) programs to parse descriptors ++ LISTER=`which usbmodules` ++ if [ "$LISTER" = "" -o ! -f /proc/bus/usb/devices ]; then ++ echo "** can't synthesize root hub events" ++ return 1 + fi +- else ++ ++ DEVFS=/proc/bus/usb + for DEVICE in /proc/bus/usb/*/*; do + /etc/hotplug/usb.agent + done ++ return + fi ++ ++ # for 2.6 kernels ++ [ -d /sys/bus/usb/devices/ ] || return ++ ++ # file names in /sys/bus/usb/devices/ are documented in ++ # drivers/usb/core/usb.c usb_alloc_dev() ++ ++ # device events ++ for device in /sys/bus/usb/devices/[0-9]*; do ++ # skip interface events ++ case "$device" in ++ *:*) continue;; ++ esac ++ devlink=$(readlink -f $device) ++ DEVPATH=${devlink#/sys} ++ ++ ./usb.agent ++ done ++ ++ # interface events ++ for device in /sys/bus/usb/devices/[0-9]*:*; do ++ devlink=$(readlink -f $device) ++ DEVPATH=${devlink#/sys} ++ ++ bDeviceClass=$((0x$(cat $devlink/../bDeviceClass))) ++ if [ "$bDeviceClass" = 9 ]; then ++ continue # skip hubs, nobody cares about their events ++ fi ++ ++ [ -f $devlink/../idVendor ] || continue ++ PRODUCT="$(cat $devlink/../idVendor)/$(cat $devlink/../idProduct)/$(cat $devlink/../bcdDevice)" ++ ++ if [ -f $devlink/../devnum ]; then ++ devbus=${device#/sys/bus/usb/devices/}; devbus=${devbus%-*} ++ devdev=$(cat $devlink/../devnum) ++ DEVICE="$(printf '/proc/bus/usb/%03d/%03d' $devbus $devdev)" ++ else ++ DEVICE= ++ fi ++ ++ TYPE="$bDeviceClass/$((0x$(cat $devlink/../bDeviceSubClass)))/$((0x$(cat $devlink/../bDeviceProtocol)))" ++ if [ "$bDeviceClass" = 0 ]; then ++ INTERFACE="$((0x$(cat $device/bInterfaceClass)))/$((0x$(cat $device/bInterfaceSubClass)))/$((0x$(cat $device/bInterfaceProtocol)))" ++ else ++ INTERFACE= ++ fi ++ ++ ./usb.agent ++ done + } + + maybe_modprobe() { --- hotplug-0.0.20040329.orig/debian/patches/015_ieee1394.agent_check_env +++ hotplug-0.0.20040329/debian/patches/015_ieee1394.agent_check_env @@ -0,0 +1,18 @@ +some devices may invoke ieee1394.agent without VENDOR_ID or so. +In this case, posix shell may complains to fail to evaluate $((0x)) + +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/ieee1394.agent hotplug-2004_03_29/etc/hotplug/ieee1394.agent +--- hotplug-2004_03_29.orig/etc/hotplug/ieee1394.agent 2004-03-27 07:34:34.000000000 +0900 ++++ hotplug-2004_03_29/etc/hotplug/ieee1394.agent 2004-04-03 20:03:49.000000000 +0900 +@@ -37,7 +37,10 @@ + mesg Bad IEEE1394 agent invocation + exit 1 + fi +- ++if [ "$VENDOR_ID" = "" ]; then ++ debug_mesg Bad IEEE1394 agent invocation ++ exit 1 ++fi + + device_vendor_id=$((0x$VENDOR_ID)) + device_specifier_id=$((0x$SPECIFIER_ID)) --- hotplug-0.0.20040329.orig/debian/patches/065_default.hotplug_nobash +++ hotplug-0.0.20040329/debian/patches/065_default.hotplug_nobash @@ -0,0 +1,9 @@ +diff -ru build-tree.old/hotplug-2004_03_29/etc/hotplug.d/default/default.hotplug build-tree/hotplug-2004_03_29/etc/hotplug.d/default/default.hotplug +--- hotplug-2004_03_29/etc/hotplug.d/default/default.hotplug 2004-03-26 14:34:34.000000000 -0800 ++++ hotplug-2004_03_29/etc/hotplug.d/default/default.hotplug 2005-01-18 17:19:10.312071168 -0800 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # This version of /sbin/hotplug should works on most GNU/Linux systems + # using Linux 2.2.18+ or 2.4.* kernels. On 2.2.*, only USB has such --- hotplug-0.0.20040329.orig/debian/patches/hotplug.functions_typo +++ hotplug-0.0.20040329/debian/patches/hotplug.functions_typo @@ -0,0 +1,12 @@ +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/hotplug.functions hotplug-2004_03_29/etc/hotplug/hotplug.functions +--- hotplug-2004_03_29.orig/etc/hotplug/hotplug.functions 2004-06-05 17:21:06.000000000 +0200 ++++ hotplug-2004_03_29/etc/hotplug/hotplug.functions 2004-06-05 17:21:01.000000000 +0200 +@@ -170,7 +170,7 @@ + # /etc/modules.conf may have set non-default module + # parameters ... handle per-device parameters in apps + # (ioctls etc) not in setup scripts or modules.conf +- mesg " $MODULE: loaded sucessfully" ++ mesg " $MODULE: loaded successfully" + LOADED=true + fi + else --- hotplug-0.0.20040329.orig/debian/patches/015_load_drivers_mesg_format +++ hotplug-0.0.20040329/debian/patches/015_load_drivers_mesg_format @@ -0,0 +1,31 @@ +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/hotplug.functions hotplug-2004_03_29/etc/hotplug/hotplug.functions +--- hotplug-2004_03_29.orig/etc/hotplug/hotplug.functions 2005-03-19 22:53:00.000000000 +0100 ++++ hotplug-2004_03_29/etc/hotplug/hotplug.functions 2005-03-19 22:52:42.000000000 +0100 +@@ -153,7 +153,7 @@ + + if ! lsmod | grep -qs "^$(echo $MODULE | sed -e '[-_]/[-_]'/g) "; then + if is_blacklisted $MODULE; then +- debug_mesg "... blacklisted module: $MODULE" ++ debug_mesg " $MODULE: blacklisted" + continue + fi + +@@ -162,15 +162,17 @@ + # it's not an error if a module doesn't exist or won't load. + if $MODPROBE -n $MODULE >/dev/null 2>&1 && + ! $MODPROBE $MODULE >/dev/null 2>&1 ; then +- mesg "... can't load module $MODULE" ++ mesg " $MODULE: can't be loaded" + else + # /etc/modules.conf may have set non-default module + # parameters ... handle per-device parameters in apps + # (ioctls etc) not in setup scripts or modules.conf ++ mesg " $MODULE: loaded sucessfully" + LOADED=true + fi + else + # This module is already loaded ++ mesg " $MODULE: already loaded" + LOADED=true + fi + --- hotplug-0.0.20040329.orig/debian/patches/hotplug.8_params +++ hotplug-0.0.20040329/debian/patches/hotplug.8_params @@ -0,0 +1,12 @@ +diff -ruN hotplug-2004_01_05.orig/hotplug.8 hotplug-2004_01_05/hotplug.8 +--- hotplug-2004_01_05.orig/hotplug.8 2002-08-13 23:59:30.000000000 +0200 ++++ hotplug-2004_01_05/hotplug.8 2004-03-11 20:50:29.000000000 +0100 +@@ -8,7 +8,7 @@ + ] + .P + .B /etc/init.d/hotplug +-[start|stop|status|restart] ++[start|stop|status|force-reload|restart] + .SH "DESCRIPTION" + .B hotplug + is a program which is used by the kernel to notify user mode software --- hotplug-0.0.20040329.orig/debian/patches/053_load_drivers_ignore_video +++ hotplug-0.0.20040329/debian/patches/053_load_drivers_ignore_video @@ -0,0 +1,20 @@ +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/hotplug.functions hotplug-2004_03_29/etc/hotplug/hotplug.functions +--- hotplug-2004_03_29.orig/etc/hotplug/hotplug.functions 2004-08-06 02:25:16.000000000 +0900 ++++ hotplug-2004_03_29/etc/hotplug/hotplug.functions 2004-08-06 02:24:27.000000000 +0900 +@@ -160,6 +160,16 @@ + continue + fi + ++ # XXX: check PCI video modules ++ # On 2.4 kernel, $IGNORE_PCI_CLASS_DISPLAY hacks in pci.rc won't ++ # be used, so here checks drivers/video modules.... ++ # It prevents from breaking some working systems. Bug#261958 ++ if [ "$IGNORE_PCI_CLASS_DISPLAY" = "true" ] && \ ++ $MODPROBE -n -v "$MODULE" | grep -q '/drivers/video/' > /dev/null 2>&1; then ++ mesg " $MODULE: ignoring pci display module" ++ continue ++ fi ++ + # statically linked modules aren't shown by 'lsmod', + # and user mode drivers will ONLY have a setup script; + # it's not an error if a module doesn't exist or won't load. --- hotplug-0.0.20040329.orig/debian/patches/054_number_of_files_without_wc +++ hotplug-0.0.20040329/debian/patches/054_number_of_files_without_wc @@ -0,0 +1,57 @@ +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/hotplug.functions hotplug-2004_03_29/etc/hotplug/hotplug.functions +--- hotplug-2004_03_29.orig/etc/hotplug/hotplug.functions 2004-10-27 02:56:57.000000000 +0900 ++++ hotplug-2004_03_29/etc/hotplug/hotplug.functions 2004-10-27 02:56:35.000000000 +0900 +@@ -60,6 +60,12 @@ + } + fi + ++# provide number_of_files, because wc in /usr/bin and maybe nfs mounted ++number_of_files () { ++ # ls "$1" | wc -l ++ echo $(( 0 $(ls "$1" | sed -e 's/.*/+1/') )) ++} ++ + # + # Not "modprobe --autoclean" ... one driver module can handle many + # devices. Unloading should be done when no devices are present. +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/pci.rc hotplug-2004_03_29/etc/hotplug/pci.rc +--- hotplug-2004_03_29.orig/etc/hotplug/pci.rc 2004-10-27 02:56:57.000000000 +0900 ++++ hotplug-2004_03_29/etc/hotplug/pci.rc 2004-10-27 02:55:41.000000000 +0900 +@@ -75,7 +75,7 @@ + echo '' + + if [ -f /proc/bus/pci/devices ]; then +- COUNT=`ls /proc/bus/pci | wc -l` ++ COUNT=$(number_of_files /proc/bus/pci) + if [ $COUNT -gt 1 ]; then + COUNT=`expr $COUNT - 1` + echo "PCI up; bus count is $COUNT" +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/usb.rc hotplug-2004_03_29/etc/hotplug/usb.rc +--- hotplug-2004_03_29.orig/etc/hotplug/usb.rc 2004-10-27 02:56:57.000000000 +0900 ++++ hotplug-2004_03_29/etc/hotplug/usb.rc 2004-10-27 02:55:09.000000000 +0900 +@@ -22,6 +22,7 @@ + PATH=/sbin:/bin:/usr/sbin:/usr/bin + + cd /etc/hotplug/ ++. ./hotplug.functions + + unset I_WANT_A_BROKEN_PS + PS_PERSONALITY=linux +@@ -228,7 +229,7 @@ + # ('devices' and 'drivers') with no hcds registered, but works on + # newer kernels where usbfs has zero files until hcds register, + # and might not have the 'drivers' file. +- COUNT=`ls /proc/bus/usb | wc -l` ++ COUNT=$(number_of_files /proc/bus/usb) + if [ $COUNT -lt 2 ]; then + umount /proc/bus/usb + rmmod usbcore >/dev/null 2>&1 +@@ -381,7 +382,7 @@ + if [ -f /proc/bus/usb/devices ]; then + # as noted above: this fails on older kernels, + # where usbfs created files differently. +- COUNT=`ls /proc/bus/usb | wc -l` ++ COUNT=$(number_of_files /proc/bus/usb) + if [ $COUNT -ge 2 ]; then + COUNT=`expr $COUNT - 2` + echo "USB up; bus count is $COUNT" --- hotplug-0.0.20040329.orig/debian/patches/92blacklist-i810 +++ hotplug-0.0.20040329/debian/patches/92blacklist-i810 @@ -0,0 +1,11 @@ +diff -ru hotplug-2004_03_29.old/etc/hotplug/blacklist hotplug-2004_03_29/etc/hotplug/blacklist +--- hotplug-2004_03_29.old/etc/hotplug/blacklist 2004-08-23 15:21:19.000000000 -0700 ++++ hotplug-2004_03_29/etc/hotplug/blacklist 2004-08-23 15:21:54.000000000 -0700 +@@ -28,6 +28,7 @@ + cpu5wdt + eurotechwdt + i8xx_tco ++i810-tco + ib700wdt + indydog + machzwd --- hotplug-0.0.20040329.orig/debian/patches/90blacklist +++ hotplug-0.0.20040329/debian/patches/90blacklist @@ -0,0 +1,67 @@ +The tulip drivers have been fixed since (I checked 2.4.22). + + +Greg K-H wrote on the linux-hotplug-devel mailing list: + + You should never build the usbmouse or usbkbd driver unless you _really_ + know what you are doing (see the help entries for those modules.) So in + real life your system should never have both modules on them at the same + time, so your patch really isn't needed. + + +The list of watchdog drivers has been generated with: + +ls -1 /usr/src/linux-2.6.6/drivers/char/watchdog/*c | sed -e 's/.*\/\(.*\)\.c$/\1/' + + +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/blacklist hotplug-2004_03_29/etc/hotplug/blacklist +--- hotplug-2004_03_29.orig/etc/hotplug/blacklist 2004-03-12 00:32:59.000000000 +0100 ++++ hotplug-2004_03_29/etc/hotplug/blacklist 2004-07-13 12:26:05.000000000 +0200 +@@ -13,11 +13,41 @@ + # usbcore ... module is loaded implicitly, ignore it otherwise + usbcore + +-# tulip ... de4x5, xircom_tulip_cb, dmfe (...) handle same devices +-de4x5 +-# At least 2.4.3 and later xircom_tulip doesn't have that conflict +-# xircom_tulip_cb +-dmfe +- + #evbug is a debug tool and should be loaded explicitly + evbug ++ ++# these drivers are very simple, the HID drivers are usually preferred ++usbmouse ++usbkbd ++ ++# watchdog drivers should be loaded only if a watchdog daemon is installed ++acquirewdt ++advantechwdt ++alim1535_wdt ++alim7101_wdt ++cpu5wdt ++eurotechwdt ++i810_tco ++i8xx_tco ++ib700wdt ++indydog ++machzwd ++mixcomwd ++pcwd ++pcwd_pci ++pcwd_usb ++sa1100_wdt ++sbc60xxwdt ++sc1200wdt ++sc520_wdt ++scx200_wdt ++shwdt ++softdog ++w83627hf_wdt ++w83877f_wdt ++wafer5823wdt ++wdt285 ++wdt977 ++wdt ++wdt_pci ++ --- hotplug-0.0.20040329.orig/debian/patches/016_pci.rc_ignore_pci_class_display +++ hotplug-0.0.20040329/debian/patches/016_pci.rc_ignore_pci_class_display @@ -0,0 +1,20 @@ +ignore PCI_CLASS_DISPLAY* to prevent loading framebuffer device driver. +see Bug#241765, Bug#238321 + +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/pci.rc hotplug-2004_03_29/etc/hotplug/pci.rc +--- hotplug-2004_03_29.orig/etc/hotplug/pci.rc 2004-04-04 04:00:13.000000000 +0900 ++++ hotplug-2004_03_29/etc/hotplug/pci.rc 2004-04-04 03:59:17.000000000 +0900 +@@ -38,6 +38,13 @@ + sub_vendor_id=`cat $PCI_DEVICE/subsystem_vendor` + sub_device_id=`cat $PCI_DEVICE/subsystem_device` + PCI_SUBSYS_ID="${sub_vendor_id#0x}:${sub_device_id#0x}" ++ # FIXME: more generic way? ++ if [ "$IGNORE_PCI_CLASS_DISPLAY" = "true" ]; then ++ case "$PCI_CLASS" in ++ 03*) mesg " ignoring pci display device $PCI_SLOT_NAME" ++ continue;; ++ esac ++ fi + /sbin/hotplug pci + done + fi --- hotplug-0.0.20040329.orig/debian/patches/006_try_all_drivers +++ hotplug-0.0.20040329/debian/patches/006_try_all_drivers @@ -0,0 +1,11 @@ +diff -ruN hotplug-2004_01_05.orig/etc/hotplug/pci.agent hotplug-2004_01_05/etc/hotplug/pci.agent +--- hotplug-2004_01_05.orig/etc/hotplug/pci.agent 2004-02-03 00:36:16.000000000 +0100 ++++ hotplug-2004_01_05/etc/hotplug/pci.agent 2004-02-03 00:33:44.000000000 +0100 +@@ -122,7 +122,6 @@ + if [ $class_temp -eq $class ]; then + DRIVERS="$module $DRIVERS" + : drivers $DRIVERS +- break + fi + done + } --- hotplug-0.0.20040329.orig/debian/patches/010_functions_misc +++ hotplug-0.0.20040329/debian/patches/010_functions_misc @@ -0,0 +1,50 @@ +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/hotplug.functions hotplug-2004_03_29/etc/hotplug/hotplug.functions +--- hotplug-2004_03_29.orig/etc/hotplug/hotplug.functions 2004-03-29 21:25:59.000000000 +0200 ++++ hotplug-2004_03_29/etc/hotplug/hotplug.functions 2005-03-19 22:47:19.000000000 +0100 +@@ -58,6 +58,17 @@ + #MODPROBE="/sbin/modprobe -vs" + + ++# return true if the argument is a blacklisted module ++is_blacklisted() { ++ MODULE_EXPR="$(echo $1 | sed -e 's/[-_]/[-_]/g')" ++ if grep -qs "^${MODULE_EXPR}$" \ ++ $HOTPLUG_DIR/blacklist $HOTPLUG_DIR/blacklist.d/*; then ++ return 0 ++ fi ++ return 1 ++} ++ ++ + #################################################################### + # + # usage: load_driver type filename description +@@ -123,14 +134,25 @@ + # For USB, some user-mode drivers or setup scripts may be listed. + debug_mesg Setup $DRIVERS for $DESCRIPTION + ++ LOADED_DRIVERS="" + # either kernel or user mode drivers may need to be set up + for MODULE in $DRIVERS + do + # maybe driver modules need loading + LOADED=false +- if ! lsmod | grep -q "^$MODULE " > /dev/null 2>&1; then +- if grep -q "^$MODULE\$" $HOTPLUG_DIR/blacklist \ +- >/dev/null 2>&1; then ++ ++ # check if the $MODULE has been already seen ++ if echo "|$LOADED_DRIVERS|" | grep -qs "|$MODULE|"; then ++ # $MODULE is duplicated? ++ continue ++ fi ++ # XXX: ++ # Even if $LOADED = false, we may not need to try loading it again. ++ # or do we need to check $LOADED = true at end of the loop? ++ LOADED_DRIVERS="$LOADED_DRIVERS|$MODULE" ++ ++ if ! lsmod | grep -qs "^$(echo $MODULE | sed -e 's/[-_]/[-_]/g') "; then ++ if is_blacklisted $MODULE; then + debug_mesg "... blacklisted module: $MODULE" + continue + fi --- hotplug-0.0.20040329.orig/debian/patches/008_mesg_logging +++ hotplug-0.0.20040329/debian/patches/008_mesg_logging @@ -0,0 +1,20 @@ +diff -ruN hotplug-2004_03_11.orig/etc/hotplug/hotplug.functions hotplug-2004_03_11/etc/hotplug/hotplug.functions +--- hotplug-2004_03_11.orig/etc/hotplug/hotplug.functions 2004-03-20 23:56:49.000000000 +0900 ++++ hotplug-2004_03_11/etc/hotplug/hotplug.functions 2004-03-20 23:56:05.000000000 +0900 +@@ -32,10 +32,15 @@ + # + # for diagnostics + # +-if [ -t 1 -o -z "$LOGGER" ]; then ++if [ -t 1 -a -z "$LOGGER" ]; then + mesg () { + echo "$@" + } ++elif [ -t 1 ]; then ++ mesg () { ++ echo "$@" ++ $LOGGER -t $(basename $0)"[$$]" "$@" ++ } + else + mesg () { + $LOGGER -t $(basename $0)"[$$]" "$@" --- hotplug-0.0.20040329.orig/debian/patches/93blacklist2-eepro100 +++ hotplug-0.0.20040329/debian/patches/93blacklist2-eepro100 @@ -0,0 +1,10 @@ +diff -ru build-tree.orig/hotplug-2004_03_29/etc/hotplug/blacklist build-tree/hotplug-2004_03_29/etc/hotplug/blacklist +--- hotplug-2004_03_29/etc/hotplug/blacklist 2004-10-30 11:19:33.786784368 -0700 ++++ hotplug-2004_03_29/etc/hotplug/blacklist 2004-10-30 11:19:53.496787992 -0700 +@@ -54,3 +54,6 @@ + + # causes no end of confusion by creating unexpected network interfaces + eth1394 ++ ++# eepro100 is obsoleted by e100 (Ubuntu bug #2156) ++eepro100 --- hotplug-0.0.20040329.orig/debian/patches/firmware_dirs +++ hotplug-0.0.20040329/debian/patches/firmware_dirs @@ -0,0 +1,36 @@ +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/firmware.agent hotplug-2004_03_29/etc/hotplug/firmware.agent +--- hotplug-2004_03_29.orig/etc/hotplug/firmware.agent 2004-03-26 23:34:34.000000000 +0100 ++++ hotplug-2004_03_29/etc/hotplug/firmware.agent 2004-06-06 17:05:35.000000000 +0200 +@@ -19,8 +19,8 @@ + . ./hotplug.functions + # DEBUG=yes export DEBUG + +-# directory of the firmware files +-FIRMWARE_DIR=/usr/lib/hotplug/firmware ++# directories with the firmware files ++FIRMWARE_DIRS="/lib/hotplug/firmware /usr/local/lib/hotplug/firmware /usr/lib/hotplug/firmware" + + # mountpoint of sysfs + SYSFS=$(sed -n 's/^.* \([^ ]*\) sysfs .*$/\1/p' /proc/mounts) +@@ -40,13 +40,16 @@ + sleep 1 + fi + +- if [ -f "$FIRMWARE_DIR/$FIRMWARE" ]; then ++ for DIR in $FIRMWARE_DIRS; do ++ [ -e "$DIR/$FIRMWARE" ] || continue + echo 1 > $SYSFS/$DEVPATH/loading +- cp "$FIRMWARE_DIR/$FIRMWARE" $SYSFS/$DEVPATH/data ++ cat "$DIR/$FIRMWARE" > $SYSFS/$DEVPATH/data + echo 0 > $SYSFS/$DEVPATH/loading +- else +- echo -1 > $SYSFS/$DEVPATH/loading +- fi ++ exit ++ done ++ ++ # the firmware was not found ++ echo -1 > $SYSFS/$DEVPATH/loading + + ;; + --- hotplug-0.0.20040329.orig/debian/patches/blacklist +++ hotplug-0.0.20040329/debian/patches/blacklist @@ -0,0 +1,29 @@ +diff -Naurd hotplug-2004_03_29.orig/etc/hotplug/blacklist hotplug-2004_03_29/etc/hotplug/blacklist +--- hotplug-2004_03_29.orig/etc/hotplug/blacklist 2005-04-15 14:50:03.725936000 +0200 ++++ hotplug-2004_03_29/etc/hotplug/blacklist 2005-04-15 14:52:09.371835672 +0200 +@@ -20,6 +20,15 @@ + usbmouse + usbkbd + ++# replaced by e100 ++eepro100 ++ ++# replaced by tulip ++de4x5 ++ ++# replaced by tmscsim ++am53c974 ++ + # watchdog drivers should be loaded only if a watchdog daemon is installed + acquirewdt + advantechwdt +@@ -55,9 +64,6 @@ + # causes no end of confusion by creating unexpected network interfaces + eth1394 + +-# eepro100 is obsoleted by e100 (Ubuntu bug #2156) +-eepro100 +- + # snd_intel8x0m can interfere with snd_intel8x0, doesn't seem to support much + # hardware on its own (Ubuntu bug #2011, #6810) + snd_intel8x0m --- hotplug-0.0.20040329.orig/debian/patches/firmware_misc +++ hotplug-0.0.20040329/debian/patches/firmware_misc @@ -0,0 +1,29 @@ +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/firmware.agent hotplug-2004_03_29/etc/hotplug/firmware.agent +--- hotplug-2004_03_29.orig/etc/hotplug/firmware.agent 2005-02-14 15:51:24.000000000 +0100 ++++ hotplug-2004_03_29/etc/hotplug/firmware.agent 2005-02-14 15:51:18.000000000 +0100 +@@ -23,7 +23,7 @@ + FIRMWARE_DIRS="/lib/firmware /usr/local/lib/firmware /usr/lib/hotplug/firmware" + + # mountpoint of sysfs +-SYSFS=$(sed -n 's/^.* \([^ ]*\) sysfs .*$/\1/p' /proc/mounts) ++SYSFS=$(sed -n 's/^.* \([^ ]*\) sysfs .*$/\1/p' /proc/mounts | sed -e '2,$d') + + # use /proc for 2.4 kernels + if [ "$SYSFS" = "" ]; then +@@ -36,8 +36,15 @@ + case "$ACTION" in + + add) +- if [ ! -e $SYSFS/$DEVPATH/loading ]; then ++ counter=5 ++ while [ ! -e $SYSFS/$DEVPATH/loading -a $counter -gt 0 ]; do + sleep 1 ++ counter=$(($counter - 1)) ++ done ++ ++ if [ $counter -eq 0 ]; then ++ mesg "$SYSFS/$DEVPATH/ does not exist" ++ exit 1 + fi + + for DIR in $FIRMWARE_DIRS; do --- hotplug-0.0.20040329.orig/debian/patches/006_hotplug_usb_wait +++ hotplug-0.0.20040329/debian/patches/006_hotplug_usb_wait @@ -0,0 +1,21 @@ +diff -ruN hotplug-2004_01_05.orig/etc/hotplug/usb.agent hotplug-2004_01_05/etc/hotplug/usb.agent +--- hotplug-2004_01_05.orig/etc/hotplug/usb.agent 2004-02-03 00:36:16.000000000 +0100 ++++ hotplug-2004_01_05/etc/hotplug/usb.agent 2004-02-03 00:33:02.000000000 +0100 +@@ -74,6 +74,8 @@ + # $Id: usb.agent,v 1.35 2003/10/13 23:52:54 kroah Exp $ + # + ++HOTPLUG_USB_WAIT=3 ++ + if [ -f /etc/default/hotplug ]; then + . /etc/default/hotplug + fi +@@ -355,7 +357,7 @@ + # with slow HID devices and "usbmodules". + # starting with 2.5 (DEVPATH set), all hcds must queue control traffic. + if [ "$DEVPATH" = "" ]; then +- sleep 3 ++ sleep $HOTPLUG_USB_WAIT + fi + + usb_convert_vars --- hotplug-0.0.20040329.orig/debian/patches/usb.handmap +++ hotplug-0.0.20040329/debian/patches/usb.handmap @@ -0,0 +1,19 @@ +--- hotplug-0.0.20040105.orig/etc/hotplug/usb.handmap ++++ hotplug-0.0.20040105/etc/hotplug/usb.handmap +@@ -35,6 +35,10 @@ + joydev 0x0003 0x07b5 0x9902 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 + # Saitek Cyborg 3D USB + joydev 0x0003 0x06a3 0x0006 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 ++# Saitek P750 game pad ++joydev 0x0003 0x06a3 0x052d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 ++# Saitek P880 Joypad ++joydev 0x0003 0x06a3 0x0109 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 + #Gravis Gamepad Pro + joydev 0x0003 0x0428 0x4001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 + # Wacom tablets need "evdev" but don't depend on it; +@@ -48,3 +52,5 @@ + evdev 0x0003 0x056a 0x0011 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 + evdev 0x0003 0x056a 0x0042 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 + usblcd 0x0003 0x1212 0x0001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 ++# M-Audio Midisport 1x1 ++snd-usb-audio 0x0083 0x0763 0x1010 0x0000 0x0000 0x00 0x00 0x00 0xff 0x00 0x00 0x0 --- hotplug-0.0.20040329.orig/debian/patches/050_net.agent_ifupdown +++ hotplug-0.0.20040329/debian/patches/050_net.agent_ifupdown @@ -0,0 +1,144 @@ +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/net.agent hotplug-2004_03_29/etc/hotplug/net.agent +--- hotplug-2004_03_29.orig/etc/hotplug/net.agent 2004-03-30 00:23:31.000000000 +0200 ++++ hotplug-2004_03_29/etc/hotplug/net.agent 2004-06-26 00:59:48.000000000 +0200 +@@ -16,6 +16,16 @@ + # $Id: net.agent,v 1.18 2004/03/29 22:23:31 kroah Exp $ + # + ++# Debian-specific note: ++# NET_AGENT_POLICY (in /etc/default/hotplug) ++# all - ALL network interfaces will be ifupped ++# auto - only network interfaces marked as "auto" in /etc/network/interfaces ++# will be ifupped. ++# hotplug - hotplug brings up network interfaces with '=hotplug', so ++# you need "mapping hotplug" stanzas in /etc/network/interfaces. ++# See /usr/share/doc/hotplug/README.Debian for more details. ++# ++ + cd /etc/hotplug + . ./hotplug.functions + # DEBUG=yes export DEBUG +@@ -25,16 +35,12 @@ + exit 1 + fi + ++if [ "$NET_AGENT_POLICY" = "hotplug" ]; then ++ LIFACE='=hotplug' ++fi ++ + case $ACTION in + add|register) +- # Red Hat specific hack... +- if [ -f /etc/redhat-release ]; then +- # Don't do anything if the network is stopped +- if [ ! -f /var/lock/subsys/network ]; then +- exit 0 +- fi +- fi +- + case $INTERFACE in + # interfaces that are registered after being "up" (?) + ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*|ipsec*|tun*|tap*) +@@ -43,10 +49,6 @@ + ;; + # interfaces that are registered then brought up + *) +- # NOTE: network configuration relies on administered state, +- # we can't do much here without distro-specific knowledge +- # such as whether/how to invoke DHCP, set up bridging, etc. +- + # Run ifrename as needed - Jean II + # Remap interface names based on MAC address. This workaround + # the dreaded configuration problem "all my cards are 'eth0'"... +@@ -62,19 +64,61 @@ + fi; + fi + +- # RedHat and similar +- export IN_HOTPLUG=1 + if [ -x /sbin/ifup ]; then +- debug_mesg invoke ifup $INTERFACE +- exec /sbin/ifup $INTERFACE ++ if grep -q '^auto[[:space:]].*\<'"$INTERFACE"'\>' \ ++ /etc/network/interfaces; then ++ # this $INTERFACE is marked as "auto" ++ autoif=true ++ fi ++ if [ "$NET_AGENT_POLICY" = "auto" -a "$autoif" != "true" ]; then ++ debug_mesg "iface $INTERFACE is not marked as 'auto'" ++ exit 0 ++ fi ++ IFUPARG="$INTERFACE" ++ if [ "$autoif" = "true" ]; then ++ IFUPARG='\('$INTERFACE'\|-a\|--all\)' ++ fi ++ if ps -C ifup ho args | grep -q "$IFUPARG"; then ++ debug_mesg "Already ifup-ing that interface" ++ else ++ start-stop-daemon --start --background \ ++ --pidfile /var/run/hotplug.net.ifup.bogus \ ++ --startas /etc/hotplug/net.ifup -- "$INTERFACE$LIFACE" ++ fi ++ exit 0 + else +- mesg "how do I bring interfaces up on this distro?" ++ mesg "E: /sbin/ifup not found. You need to install the ifupdown package." + fi + ;; + esac + mesg $1 $ACTION event not handled + ;; + ++remove|unregister) ++ # the pppd persist option may have been used, so it should not be killed ++ case $INTERFACE in ++ ppp[0-9]*) ++ exit 0 ++ ;; ++ esac ++ # Run ifdown because it is not going to remove the data from the ++ # ifstate database otherwise. ++ if [ -x /sbin/ifdown ]; then ++ if ps -C ifdown ho args | grep -q $INTERFACE; then ++ debug_mesg "Already ifdown-ing interface $INTERFACE" ++ elif [ ! -e /etc/hotplug/.run/net.enable ]; then ++ debug_mesg "The net.enable flag does not exist, $INTERFACE not removed" ++ else ++ debug_mesg "Invoking ifdown $INTERFACE" ++ ifdown "$INTERFACE" ++ fi ++ exit 0 ++ else ++ mesg "E: /sbin/ifdown not found. You need to install the ifupdown package" ++ fi ++ mesg "$1 $ACTION event not handled" ++ ;; ++ + *) + debug_mesg NET $ACTION event not supported + exit 1 ;; +diff -ruN hotplug-2004_03_29.orig/etc/hotplug/net.ifup hotplug-2004_03_29/etc/hotplug/net.ifup +--- hotplug-2004_03_29.orig/etc/hotplug/net.ifup 1970-01-01 01:00:00.000000000 +0100 ++++ hotplug-2004_03_29/etc/hotplug/net.ifup 2004-06-26 00:55:35.000000000 +0200 +@@ -0,0 +1,21 @@ ++#!/bin/sh ++ ++IFUP_TIMEOUT=120 ++ ++cd /etc/hotplug ++. ./hotplug.functions ++ ++[ -e /etc/hotplug/.run/net.enable ] || debug_mesg "Waiting for the net.enable flag" ++while [ $IFUP_TIMEOUT != 0 ]; do ++ if [ -e /etc/hotplug/.run/net.enable ]; then ++ debug_mesg "Invoking ifup $1" ++ ifup "$1" ++ exit ++ fi ++ sleep 1 ++ IFUP_TIMEOUT=$(($IFUP_TIMEOUT - 1)) ++done ++ ++debug_mesg "Failed to see the net.enable flag" ++exit 1 ++ --- hotplug-0.0.20040329.orig/debian/patches/95blacklist-i2c-i801 +++ hotplug-0.0.20040329/debian/patches/95blacklist-i2c-i801 @@ -0,0 +1,10 @@ +diff -ruNp hotplug-2004_03_29.orig/etc/hotplug/blacklist hotplug-2004_03_29/etc/hotplug/blacklist +--- hotplug-2004_03_29.orig/etc/hotplug/blacklist 2005-09-30 06:56:19.570761000 +0100 ++++ hotplug-2004_03_29/etc/hotplug/blacklist 2005-09-30 06:59:49.837795736 +0100 +@@ -67,3 +67,6 @@ eth1394 + # snd_intel8x0m can interfere with snd_intel8x0, doesn't seem to support much + # hardware on its own (Ubuntu bug #2011, #6810) + snd_intel8x0m ++ ++# causes failure to suspend on HP compaq nc6000 (Ubuntu: #10306) ++i2c_i801 --- hotplug-0.0.20040329.orig/debian/patches/080_wait_for_network +++ hotplug-0.0.20040329/debian/patches/080_wait_for_network @@ -0,0 +1,22 @@ +diff -ruNp hotplug-2004_03_29.orig/etc/hotplug/net.agent hotplug-2004_03_29/etc/hotplug/net.agent +--- hotplug-2004_03_29.orig/etc/hotplug/net.agent 2005-10-04 08:56:01.604911000 +0100 ++++ hotplug-2004_03_29/etc/hotplug/net.agent 2005-10-04 09:09:36.123085960 +0100 +@@ -81,6 +81,7 @@ add|register) + if ps -C ifup ho args | grep -q "$IFUPARG"; then + debug_mesg "Already ifup-ing that interface" + else ++ touch /etc/hotplug/.run/net.busy + start-stop-daemon --start --background \ + --pidfile /var/run/hotplug.net.ifup.bogus \ + --startas /etc/hotplug/net.ifup -- "$INTERFACE$LIFACE" +diff -ruNp hotplug-2004_03_29.orig/etc/hotplug/net.ifup hotplug-2004_03_29/etc/hotplug/net.ifup +--- hotplug-2004_03_29.orig/etc/hotplug/net.ifup 2005-10-04 08:56:01.544920000 +0100 ++++ hotplug-2004_03_29/etc/hotplug/net.ifup 2005-10-04 09:09:48.685176232 +0100 +@@ -10,6 +10,7 @@ while [ $IFUP_TIMEOUT != 0 ]; do + if [ -e /etc/hotplug/.run/net.enable ]; then + debug_mesg "Invoking ifup $1" + ifup "$1" ++ rm -f /etc/hotplug/.run/net.busy + exit + fi + sleep 1 --- hotplug-0.0.20040329.orig/debian/hotplug.postrm +++ hotplug-0.0.20040329/debian/hotplug.postrm @@ -0,0 +1,19 @@ +#!/bin/sh -e + +case "$1" in + purge) + rm -f /etc/default/hotplug /etc/hotplug/.run/net.enable + rmdir /etc/hotplug/.run/ /etc/hotplug/ 2> /dev/null || true + rmdir /usr/local/lib/firmware/ 2> /dev/null || true + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "$0 called with unknown argument '$1'" >&2 + exit 0 +esac + +#DEBHELPER# + --- hotplug-0.0.20040329.orig/debian/copyright +++ hotplug-0.0.20040329/debian/copyright @@ -0,0 +1,18 @@ +This package was initially debianized by HAYASE Shigenori on +Thu, 25 Jan 2001 02:18:18 +0900. +Modified by Fumitoshi UKAI + +It was downloaded from http://linux-hotplug.sourceforge.net/ + +Upstream Developers: + David Brownell + Greg Kroah-Hartma + Matthew Dharm + Miles Lane + Randy Dunlap + +Copyright: + You are free to distribute this software under the terms of + the GNU General Public License. + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL file. --- hotplug-0.0.20040329.orig/debian/hotplug.dirs +++ hotplug-0.0.20040329/debian/hotplug.dirs @@ -0,0 +1,20 @@ +/sbin/ +/etc/default/ +/etc/hotplug/ +/etc/hotplug/usb/ +/etc/hotplug/blacklist.d/ +/etc/hotplug/pci/ +/etc/hotplug/.run/ +/etc/hotplug.d/ +/etc/hotplug.d/default/ +/etc/hotplug.d/chandev/ +/etc/hotplug.d/dock/ +/etc/hotplug.d/ieee1394/ +/etc/hotplug.d/input/ +/etc/hotplug.d/net/ +/etc/hotplug.d/pci/ +/etc/hotplug.d/scsi/ +/etc/hotplug.d/usb/ +/etc/modprobe.d/ +/var/run/usb/ +/usr/lib/hotplug/firmware/ --- hotplug-0.0.20040329.orig/debian/hotplug.postinst +++ hotplug-0.0.20040329/debian/hotplug.postinst @@ -0,0 +1,109 @@ +#!/bin/sh -e + +. /usr/share/debconf/confmodule + +create_config_file() { + test -f /etc/hotplug/usb.option && . /etc/hotplug/usb.option + rm -f /etc/hotplug/usb.option /etc/hotplug/usb.option.dpkg-old + test -f /etc/default/hotplug.usb && . /etc/default/hotplug.usb + + : > /etc/hotplug/.run/net.enable + + db_get hotplug/x11_usbmice_hack + X11_USBMICE_HACK="$RET" + db_get hotplug/static_module_list + STATIC_MODULE_LIST=$(echo "$RET" | sed -e 's/, / /g' -e 's/,$//') + db_get hotplug/net_agent_policy + NET_AGENT_POLICY="$RET" + db_get hotplug/ignore_pci_class_display + IGNORE_PCI_CLASS_DISPLAY="$RET" + + # move /etc/hotplug/usb.usermap.local if it still exists + test -f /etc/hotplug/usb.usermap.local && \ + mv /etc/hotplug/usb.usermap.local /etc/hotplug/usb/local.usermap + + # this file is not being used anymore + test -f /etc/default/hotplug.usb && rm /etc/default/hotplug.usb + + if [ -f /etc/default/hotplug ]; then + sed -e 's|^#.*/usr/share/doc/hotplug/README.*|# See also /usr/share/doc/hotplug/README.Debian|' \ + -e 's/^#.*END OF FILE.*//' \ + -e 's@^STATIC_MODULE_LIST=.*@STATIC_MODULE_LIST="'"$STATIC_MODULE_LIST"'"@' \ + -e 's/^X11_USBMICE_HACK=.*/X11_USBMICE_HACK='"$X11_USBMICE_HACK"'/' \ + -e '/^USE_NET_LIFACE=.*/d' \ + -e 's/^NET_AGENT_POLICY=.*/NET_AGENT_POLICY='$NET_AGENT_POLICY'/' \ + -e 's/^IGNORE_PCI_CLASS_DISPLAY=.*/IGNORE_PCI_CLASS_DISPLAY='$IGNORE_PCI_CLASS_DISPLAY'/' \ + < /etc/default/hotplug > /etc/default/hotplug.dpkg-tmp + if ! grep -q '^NET_AGENT_POLICY=' /etc/default/hotplug; then + echo "NET_AGENT_POLICY=$NET_AGENT_POLICY" >> /etc/default/hotplug.dpkg-tmp + fi + if ! grep -q '^IGNORE_PCI_CLASS_DISPLAY=' /etc/default/hotplug; then + echo "IGNORE_PCI_CLASS_DISPLAY=$IGNORE_PCI_CLASS_DISPLAY" >> /etc/default/hotplug.dpkg-tmp + fi + if ! grep -q -E '^([# ]+)?QUIET=' /etc/default/hotplug; then + echo "#QUIET=yes" >> /etc/default/hotplug.dpkg-tmp + fi + if cmp -s /etc/default/hotplug.dpkg-tmp /etc/default/hotplug; then + rm -f /etc/default/hotplug.dpkg-tmp + else + mv -f /etc/default/hotplug /etc/default/hotplug.dpkg-old + mv -f /etc/default/hotplug.dpkg-tmp /etc/default/hotplug + fi + else + cat < /etc/default/hotplug +# hotplug configuraton file +# See also /usr/share/doc/hotplug/README.Debian +# This file is automatically generated by hotplug package +# +# STATIC_MODULE_LIST="..." +# - which modules are preloaded? +# deprecated. if you need to load at start time, use /etc/modules instead +# it will be removed in future +STATIC_MODULE_LIST="$STATIC_MODULE_LIST" +# +# X11_USBMICE_HACK +# - use USB mouse with X11? +# deprecated. if you need to load at start time, use /etc/modules instead +# it will be removed in future +X11_USBMICE_HACK=$X11_USBMICE_HACK +# +# NET_AGENT_POLICY +# - how to manage network interfaces with ifupdown? 'all', 'auto' or 'hotplug' +NET_AGENT_POLICY=$NET_AGENT_POLICY +# +# IGNORE_PCI_CLASS_DISPLAY +# - ignore PCI_CLASS_DISPLAY? +IGNORE_PCI_CLASS_DISPLAY=$IGNORE_PCI_CLASS_DISPLAY +# +# You can use HOTPLUG_RC_=no to disable hotplugging for it, e.g: +#HOTPLUG_RC_pci=no +#HOTPLUG_RC_net=no +# +# Set this variable to make the init script *very* quiet. +#QUIET=yes +USBOPTION + fi +} + +case "$1" in + configure) + create_config_file + if [ ! -e /usr/local/lib/firmware/ ]; then + mkdir -p /usr/local/lib/firmware/ 2> /dev/null || true + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument '$1'" >&2 + exit 1 + ;; +esac + +db_stop + +#DEBHELPER# + +exit 0 --- hotplug-0.0.20040329.orig/debian/templates +++ hotplug-0.0.20040329/debian/templates @@ -0,0 +1,39 @@ +Template: hotplug/x11_usbmice_hack +Type: boolean +Default: false +_Description: Do you use USB mouse with X11? + If you need to use a USB mouse with X, the X server needs to be able to + open "/dev/input/mice" on startup. That means you can't normally hotplug + a mouse you plan to use with X; it needs some modules preloaded. However, + hotplug has a hack to let this work, which you can turn on here if you + anticipate using a USB mouse. + +Template: hotplug/static_module_list +Type: multiselect +Choices: ${usbmodules} +Default: +_Description: Which USB modules do you want to be preloaded? + Before running hotplug support, you can preload some USB modules. + +Template: hotplug/net_agent_policy +Type: select +Default: auto +Choices: all, auto, hotplug +_Description: Which network interfaces do you want to be managed by hotplug? + When a network interface appears in the system, hotplug will detect it and + try to up it by using ifup. You can select hot-pluggable network interfaces: + all: all network interfaces in /etc/network/interfaces. + auto: network interfaces marked as 'auto' in /etc/network/interfaces. + non-'auto' network interfaces will be ignored. + hotplug: selected network interfaces by 'mapping hotplug' stanzas + in /etc/network/interfaces. In this case, hotplug will bring up + the network interface with logical interface name + (e.g. ifup eth0=hotplug). + +Template: hotplug/ignore_pci_class_display +Type: boolean +Default: true +_Description: Do you want to ignore PCI display devices? + By default, hotplug ignores PCI display devices, so device drivers won't + be loaded automatically. + --- hotplug-0.0.20040329.orig/debian/hotplug.init +++ hotplug-0.0.20040329/debian/hotplug.init @@ -0,0 +1,155 @@ +#!/bin/sh -e +# +# description: Starts and stops each hotpluggable subsystem. +# On startup, may simulate hotplug events for devices +# that were present at boot time, before filesystems +# used by /sbin/hotplug became available. + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +[ -x /sbin/hotplug ] || exit 0 + +. /lib/lsb/init-functions +. /etc/default/rcS +if [ "x$VERBOSE" = "xno" ]; then + MODPROBE_OPTIONS="$MODPROBE_OPTIONS -Q" + export MODPROBE_OPTIONS + + # default to quiet in normal boot, be verbose in recovery mode + if [ -e /proc/cmdline ] && ! grep -q '\' /proc/cmdline; then + QUIET=yes + fi +fi + +if [ ! -f /proc/sys/kernel/hotplug ]; then + log_warning_msg "Kernel hotplug support not enabled." + exit 0 +fi + +# execution order of the *.rc scripts +RC_ORDER="pci usb isapnp" + +[ -e /etc/default/hotplug ] && . /etc/default/hotplug + +# Takes two parameters: list to sort through and list of elements +# that should be removed from it. As a side effect it modifies +# $prune_output (the list with the elements removed) and $prune_discard +# (the list of the elements discarded). +prune() { + unset prune_output prune_discard + local discard + + for x in $1; do + unset discard + for y in $2; do + [ $x = $y ] && discard=yes + done + if [ "$discard" ]; then + prune_discard="$prune_discard $x" + else + prune_output="$prune_output $x" + fi + done +} + +# Prints the elements from the first argument, in the order in which they +# appear in the second argument. +sort_with_deps() { + local unordered + + # Get the list of elements that have no ordering requirement. + prune "$1" "$2" + unordered=$prune_output + + # Reverse psychology here. Throw away all items of the DEPLIST that + # we actually want. prune_discard will have them in the right order. + prune "$2" "$prune_discard" + + # Append the elements with no ordering to the sorted list. + echo "$prune_discard $unordered" + + unset prune_output prune_discard +} + +quiet_printk() { + [ -w /proc/sys/kernel/printk -a "$QUIET" ] || return 0 + SAVED_LOGLEVEL=$(cat /proc/sys/kernel/printk) + echo "1 4 1 7" > /proc/sys/kernel/printk +} + +restore_printk() { + [ "$SAVED_LOGLEVEL" ] || return 0 + echo "$SAVED_LOGLEVEL" > /proc/sys/kernel/printk +} + +run_rcs() { + for RC in /etc/hotplug/*.rc; do + local basename=${RC#/etc/hotplug/} + SUBSYSTEMS="$SUBSYSTEMS ${basename%.rc}" + done + + SUBSYSTEMS=$(sort_with_deps "$SUBSYSTEMS" "$RC_ORDER") + + log_begin_msg "$2..." + + for name in $SUBSYSTEMS; do + if which usplash_write >/dev/null; then + usplash_write "PING" || true + fi + if [ "$(eval echo \$HOTPLUG_RC_$name)" = no \ + -o ! -x /etc/hotplug/$name.rc ]; then + [ "$QUIET" ] || log_warning_msg " $name [disabled]" + continue + fi + + if [ "$1" = status ]; then + /etc/hotplug/$name.rc $1 || true + continue + elif [ "$QUIET" ]; then + /etc/hotplug/$name.rc $1 > /dev/null 2>&1 + else + log_begin_msg " $name" + /etc/hotplug/$name.rc $1 + log_end_msg $? + fi + done + + if [ "$QUIET" ]; then + log_end_msg 0 + else + log_begin_msg "done." + fi +} + +case "$1" in +start) + quiet_printk + run_rcs $1 "Starting hotplug subsystem" + restore_printk + ;; + +stop) + quiet_printk + run_rcs $1 "Stopping hotplug subsystem" + restore_printk + ;; + +restart|force-reload) + quiet_printk + run_rcs stop "Stopping hotplug subsystem" + run_rcs start "Starting hotplug subsystem" + restore_printk + ;; + +status) + unset QUIET + run_rcs $1 "Hotplug status" + ;; + +*) + echo "Usage: $0 {start|stop|restart|status|force-reload}" + exit 1 + ;; +esac + +exit 0 --- hotplug-0.0.20040329.orig/debian/hotplug.hotplug-net.init +++ hotplug-0.0.20040329/debian/hotplug.hotplug-net.init @@ -0,0 +1,39 @@ +#!/bin/sh -e +# +# nethotplug manage Debian-specific network interfaces state files +# + +HOTPLUG_TIMEOUT=900 # Note: tenths + +. /lib/lsb/init-functions + +case "$1" in + start) + : > /etc/hotplug/.run/net.enable + + if [ -e /etc/hotplug/.run/net.busy ]; then + log_begin_msg "Waiting for network interface to come up..." + while [ -e /etc/hotplug/.run/net.busy ] && + [ $HOTPLUG_TIMEOUT != 0 ]; do + sleep 0.1 + HOTPLUG_TIMEOUT=$(($HOTPLUG_TIMEOUT - 1)) + done + if [ $HOTPLUG_TIMEOUT != 0 ]; then + log_end_msg 0 + else + log_end_msg 1 + fi + fi + ;; + stop) + if [ -e /etc/hotplug/.run/net.enable ]; then + rm -f /etc/hotplug/.run/net.enable + fi + ;; + restart|force-reload) + ;; + *) + echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac --- hotplug-0.0.20040329.orig/debian/changelog +++ hotplug-0.0.20040329/debian/changelog @@ -0,0 +1,1321 @@ +hotplug (0.0.20040329-22ubuntu13) breezy; urgency=low + + * Wait for at least one hotplugged network interface to complete + before carrying on the boot sequence; this provides a temporary solution + to the problem of following services (ntpdate, nfs mounting, pppoeconf, + etc.) requiring a network card that may not have finished DHCP in the + completely parallel system. (Ubuntu: #14729, #16720, #16774) + + -- Scott James Remnant Tue, 4 Oct 2005 09:10:48 +0100 + +hotplug (0.0.20040329-22ubuntu12) breezy; urgency=low + + * Added debian/patches/95blacklist-i2c-i801 (Ubuntu: #10306). + + -- Scott James Remnant Fri, 30 Sep 2005 07:01:02 +0100 + +hotplug (0.0.20040329-22ubuntu11) breezy; urgency=low + + * Use "..." rather than ":" in the init script messages for consistency with + other init scripts + + -- Matt Zimmerman Mon, 29 Aug 2005 15:34:12 -0700 + +hotplug (0.0.20040329-22ubuntu10) breezy; urgency=low + + * Send a PING to usplash before processing each subsystem, to help prevent + timeouts (might still be too infrequent on some systems) + + -- Matt Zimmerman Mon, 29 Aug 2005 12:06:36 -0700 + +hotplug (0.0.20040329-22ubuntu9) breezy; urgency=low + + * debian/hotplug.init: Only default to QUIET if we are booting in normal + mode; be verbose in single user mode. (Ubuntu #11118) + + -- Martin Pitt Tue, 23 Aug 2005 10:22:57 +0200 + +hotplug (0.0.20040329-22ubuntu8) breezy; urgency=low + + * Added debian/patches/051_net.agent_ifrename_-t to enable interface + name takeover support when calling ifrename. + (Ubuntu #8391, #10240, #13551) + + -- Scott James Remnant Thu, 18 Aug 2005 02:25:52 +0100 + +hotplug (0.0.20040329-22ubuntu7) breezy; urgency=low + + * debian/hotplug.preinst: + - If /etc/modprobe.d/isapnp/isapnp.aliases is unmodified, remove it + instead of moving it to new location /etc/modprobe.d/isapnp to avoid + dpkg conffile question on Hoary->Breezy upgrade. + - Ubuntu #12317 + + -- Martin Pitt Wed, 17 Aug 2005 09:58:59 +0200 + +hotplug (0.0.20040329-22ubuntu6) breezy; urgency=low + + * Add a new /etc/hotplug/net.rc that cold-plugs any network devices + that have already been installed. + * Run net.rc during normal startup (in S40hotplug), the actual ifup parts + will wait until after S41hotplug-net have been run. This saves some + code duplication and isn't that less efficient. + * Don't remove net.rc during upgrades. + + -- Scott James Remnant Mon, 15 Aug 2005 19:09:57 +0100 + +hotplug (0.0.20040329-22ubuntu5) breezy; urgency=low + + * Avoid using head in firmware.agent, since it's in /usr (thanks, + Fumitoshi UKAI). + + -- Colin Watson Fri, 12 Aug 2005 09:53:38 +0100 + +hotplug (0.0.20040329-22ubuntu4) breezy; urgency=low + + * Tweak firmware_misc patch to work around the lack of a sed feature in + busybox sed (empty regex repeats previous match). + + -- Colin Watson Wed, 10 Aug 2005 21:13:22 +0100 + +hotplug (0.0.20040329-22ubuntu3) breezy; urgency=low + + * Install extra/ide.rc and extra/scsi.rc in hotplug-udeb too. + + -- Colin Watson Wed, 29 Jun 2005 12:55:16 +0100 + +hotplug (0.0.20040329-22ubuntu2) breezy; urgency=low + + * debian/patches/scsi.agent_cleanup: Assign module name to MODULES instead + of MODULE to make modprobe loop actually work. (Ubuntu #9913, maybe + #10034) + * Remove debian/patches/071_scsi: scsi.rc is now already shipped in extra/ + by Debian, so do that for Ubuntu, too. The other part of the patch + disrupts Debian's version of scsi.agent_cleanup. + * Added extra/ide.rc, dropped debian/patches/070_ide.rc. + * Synced debian/po/{de,it}.po with Debian. + * debian/hotplug.init: Changed back log_success_msg to echo for usage help + (which isn't supposed to use LSB functions). + + -- Martin Pitt Mon, 9 May 2005 10:33:43 +0200 + +hotplug (0.0.20040329-22ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Scott James Remnant Thu, 14 Apr 2005 20:41:00 +0100 + +hotplug (0.0.20040329-22) unstable; urgency=high + + * Fixed postinst to not fail if /usr/local is read only. (Closes: #303046) + * Fixed postinst to generate a correct $STATIC_MODULE_LIST even in some + obscure corner case. (Closes: #301533) + * Updated the spanish debconf translation. (Closes: #302991) + * Finally /etc/modprobe.d/isapnp is installed with the correct name. + * Made net.agent ignore ppp* interfaces, to support the pppd persist option. + (Closes: #253936, #302709) + * Added a link for S89hotplug-net in rc[06].d. (See #303161.) + + -- Marco d'Itri Thu, 7 Apr 2005 17:51:13 +0200 + +hotplug (0.0.20040329-21) unstable; urgency=medium + + * Remove net.rc on upgrades. (See #296640) + * Depend on a newer bash package. (See #300113) + * Create /usr/local/lib/firmware/. (Closes: #300726) + + -- Marco d'Itri Thu, 24 Mar 2005 11:23:04 +0100 + +hotplug (0.0.20040329-20) unstable; urgency=medium + + * Fixed postrm failure when removing already removed directories. + (Closes: #297705) + * Sort the modules in the debconf question, patch by Sean Finney. + (Closes: #295738) + * Added patch scsi.agent_cleanup implementing support for loading the sg + driver and the blacklist check. (Closes: #272947) + Also added a scsi.rc script, by Jeff Bailey of Ubuntu. + * Added versioned dependencies on bash and sed. (Closes: #300113, #299946) + * Removed patch pci_agent_removers, because $DEVPATH does not exist + anymore after a device has been removed. (Closes: #298353) + (Actually this was a patch to usb.agent.) + * Consolidated the patches 010_load_drivers_module_name, + 013_load_drivers_check_module_dup, 014_load_drivers_blacklist_dir and + 052_module_name_for_blacklist in the new patch 010_functions_misc. + This also fixes another -/_ mismatch in modules names. (Closes: #299215) + * Removed patch 007_more_logging which has been merged in + 015_load_drivers_mesg_format. + * Added de4x5 and am53c974 to the blacklist. (See: #294867, #296199) + * Modified postinst to add an example of the QUIET variable to + /etc/default/hotplug if not present. (Closes: #297226) + * Fixed an init script bug which made it ignore scripts not in $RC_ORDER. + * Moved net.rc to a new init script hotplug-net run at S41. + (Closes: #296640) + * Removed the useless workaround introduced in -18. + + -- Marco d'Itri Sun, 20 Mar 2005 15:04:42 +0100 + +hotplug (0.0.20040329-19) unstable; urgency=high + + * workaround fix to load firmware problem. + apply kernel version with additional version like 2.6.8-2-686-smp. + + -- Fumitoshi UKAI Tue, 15 Mar 2005 07:58:58 +0900 + +hotplug (0.0.20040329-18) unstable; urgency=high + + * workaound fix to load firmware problem for sarge release. + closes: Bug#297481, Bug#299154 + /sbin/hotplug may have potential problem in hotplug event multiplexing, + but /sbin/udevsend has grave problem in firmware loading in old kernel, + so I add workaround fix to this. + Recommends upgrade kernel 2.6.10 or later. + * fix purge problem in hotplug.postrm. + + -- Fumitoshi UKAI Mon, 14 Mar 2005 23:33:28 +0900 + +hotplug (0.0.20040329-17) unstable; urgency=low + + * Made the init script stop changing /proc/sys/kernel/hotplug, to + support using udevsend as the hotplug multiplexer. + * Blacklist the obsolete eepro100 module by default. (Closes: #283129) + * Fixed a typo in the german debconf translation. (Closes: #284243) + * Added Ubuntu patch 065_default.hotplug_nobash to use sh instead of bash + in default.hotplug. (Closes: #291165) + * Modified isapnp.rc and the aliases file to only use lower case aliases. + (Closes: #268795) + * Fixed isapnp.rc to work when install statements are used in modprobe.conf. + * Added ide.rc and support to init script for running the .rc scripts in a + specified order (from Ubuntu). (Closes: #283535) + * Do not print an error message if a rc script is not executable. + (Closes: #256870) + * Documented $HOTPLUG_RC_ in /etc/default/hotplug. + (Closes: #251256) + * Added patch firmware_misc to make firmware.agent log an error if the + sysfs interface is not available and not break if sysfs is mounted more + than once. (Closes: #293128, #279142) + * Added patch pci_agent_removers with the improved generation of $REMOVER + from 2004_09_23. + * Added README.modules from 2004_09_23. + * Updated patch 011_usb.rc_dont_force_hcds to support blacklist.d/. + (Closes: #288444) + * Updated patch 012_usb.rc_fix_coldplugging with code from 2004_09_23 + and other fixes. (Closes: #274332, #288058) + * Removed patch 051_check_runlevel and the K*hotplug symlinks. + * Added code to make the init script silent, inspired by a patch from + Martin F. Krafft. (Closes: #285996) + * Modified patch 050_net.agent_ifupdown to move the net.enable flag file + to /etc/hotplug/.run/. (Closes: #258725) + + -- Marco d'Itri Wed, 16 Feb 2005 13:29:38 +0100 + +hotplug (0.0.20040329-16ubuntu17) hoary; urgency=low + + * Make sure the ide-generic load is outside the loop, not inside. + (Ubuntu BZ#7630) + + -- Jeff Bailey Wed, 16 Mar 2005 11:15:01 -0500 + +hotplug (0.0.20040329-16ubuntu16) hoary; urgency=low + + * If a RAID bus controller: VIA Technologies, Inc. VIA VT6420 SATA + RAID Controller is in the machine, load ide-generic after all + the rest of the pci drivers are loaded. + + -- Jeff Bailey Tue, 15 Mar 2005 19:34:31 -0500 + +hotplug (0.0.20040329-16ubuntu15) hoary; urgency=low + + * depend on correct version of module-init-tools (Ubuntu #7126) + * fix patch numbering so patchapply target works when LC_COLLATE != C + + -- Thom May Fri, 11 Mar 2005 10:33:26 +0000 + +hotplug (0.0.20040329-16ubuntu14) hoary; urgency=low + + * Blacklist snd_intel8x0m (Ubuntu #6810) + + -- Matt Zimmerman Thu, 10 Mar 2005 10:54:33 -0800 + +hotplug (0.0.20040329-16ubuntu13) hoary; urgency=low + + * Update 071_scsi.rc to load sg for scanners and cd's. + + -- Jeff Bailey Wed, 2 Mar 2005 16:55:32 -0500 + +hotplug (0.0.20040329-16ubuntu12) hoary; urgency=low + + * Add 071_scsi.rc patch to scan SCSI bus for devices + that need sr_mod, sd_mod etc. + (Ubuntu BZ#1440) + + * Patch initscript to make sure that scsi.rc is called after pci and usb. + + -- Jeff Bailey Tue, 1 Mar 2005 17:20:22 -0500 + +hotplug (0.0.20040329-16ubuntu11) hoary; urgency=low + + * Add 070_ide.rc patch to scan IDE bus for devices that need + ide-disk, ide-cd and ide-generic. File written by Marco d'Itri. + + * Patch initscript to make sure that ide.rc is called after pci and usb. + + (Ubuntu BZ#1763) + + -- Jeff Bailey Tue, 8 Feb 2005 11:46:10 -0500 + +hotplug (0.0.20040329-16ubuntu10) hoary; urgency=low + + * Clean up diff some more + + -- Matt Zimmerman Tue, 18 Jan 2005 21:33:47 -0800 + +hotplug (0.0.20040329-16ubuntu9) hoary; urgency=low + + * Clean up diff + + -- Matt Zimmerman Tue, 18 Jan 2005 17:36:48 -0800 + +hotplug (0.0.20040329-16ubuntu8) hoary; urgency=low + + * Change /etc/hotplug.d/default/default.hotplug to be a #!/bin/sh script, + rather than #!/bin/bash. Doesn't seem to contain any bashisms, works fine + with busybox sh, and is needed for proper installer functionality + + -- Matt Zimmerman Tue, 18 Jan 2005 17:19:50 -0800 + +hotplug (0.0.20040329-16ubuntu7) hoary; urgency=low + + * removed bashism finally :) in the run_rcs function + hotplug.init + + -- Andreas Mueller Tue, 18 Jan 2005 00:02:54 +0100 + +hotplug (0.0.20040329-16ubuntu6) hoary; urgency=low + + * removed bashism in the run_rcs function hotplug.init + closes (Ubuntu #5473) + + -- Andreas Mueller Mon, 17 Jan 2005 20:15:38 +0100 + +hotplug (0.0.20040329-16ubuntu5) hoary; urgency=low + + * Run modprobe silently (Ubuntu: #1869, #1552) + + -- Thom May Fri, 14 Jan 2005 14:40:48 +0000 + +hotplug (0.0.20040329-16ubuntu4) hoary; urgency=low + + * Remove /sbin/hotplug.real from hotplug-udeb, replaced by udevsend. + + -- Colin Watson Sun, 9 Jan 2005 23:39:58 +0000 + +hotplug (0.0.20040329-16ubuntu3) hoary; urgency=low + + * Don't change the hotplug helper; udev now sets it to udevsend, and the + default if udev isn't installed will be /sbin/hotplug anyway + + -- Matt Zimmerman Sat, 8 Jan 2005 20:21:35 -0800 + +hotplug (0.0.20040329-16ubuntu2) hoary; urgency=low + + * Add hotplug-udeb, for use in the installer. hotplug itself is installed + as /sbin/hotplug.real rather than /sbin/hotplug, since otherwise + processes like udevd get started up too early and stop init from + unmounting the first initrd. + + -- Colin Watson Tue, 16 Nov 2004 10:52:55 +0000 + +hotplug (0.0.20040329-16ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Scott James Remnant Tue, 09 Nov 2004 18:40:51 +0000 + +hotplug (0.0.20040329-16) unstable; urgency=medium + + * debian/patches/013_load_drivers_check_module_dup: + use | as separator + closes: Bug#267020 + * debian/patches/012_usb.agent_check_driver: removed + always try to load modules and call hotplug script + closes: Bug#274877 + (Bug#237952 was broken) + * debian/patches/012_usb.rc_fix_coldplugging: don't remove initialization + of $PRODUCT or other environment variable + fix D-I [i386] [netinst CD] [RC1] "Bad USB agent invocation" during + reboot on linux 2.4 + closes: Bug#266054, Bug#261303 + * debian/patches/054_number_of_files_without_wc: + introduce number_of_files that doesn't use wc -l, because + /etc/hotplug/usb.rc broken when /usr is nfs mounted. + closes: Bug#271151 + * debian/patches/055_which_by_command-v: + use command -v in case /usr is not yet mounted (NFS for example) + * debian/config, debian/hotplug.postinst: STATIC_MODULE_LIST should + be space separated, whereas debconf use comma separated + closes: Bug#274637 + * debian/hotplug: don't make unnecessary /etc/default/hotplug.dpkg-old + closes: Bug#266389 + * debian/README.Debian: fix URL of ieee1394 FAQ + closes: Bug#267355 + * debian/po/de.po: update + closes: Bug#275821 + * debian/po/it.po: added + closes: Bug#275687 + + -- Fumitoshi UKAI Wed, 27 Oct 2004 03:45:57 +0900 + +hotplug (0.0.20040329-15ubuntu3) hoary; urgency=low + + * Add support for using grepmap to parse map files instead of doing + it in slow shell script. + + -- Scott James Remnant Mon, 1 Nov 2004 11:03:55 +0000 + +hotplug (0.0.20040329-15ubuntu2) hoary; urgency=low + + * [debian/patches/blacklist2-eepro100] + Blacklist the eepro100 module, as it is obsoleted by e100 and problems + result when both are loaded (Closes: Ubuntu#2156) + + -- Matt Zimmerman Sat, 30 Oct 2004 14:06:18 -0700 + +hotplug (0.0.20040329-15ubuntu1) hoary; urgency=low + + * Resynchronise with Debian. + + -- Scott James Remnant Wed, 27 Oct 2004 21:40:44 +0100 + +hotplug (0.0.20040329-15) unstable; urgency=low + + * remove hotplug/usb_keyboard debconf note, and move the note + to README.Debian. + closes: Bug#269710 + + -- Fumitoshi UKAI Sat, 4 Sep 2004 02:05:49 +0900 + +hotplug (0.0.20040329-14) unstable; urgency=low + + * debian/patches/053_load_drivers_ignore_video + modprobe on 2.4 kernel doesn't support --show-depends, use -n -v instead + closes: Bug#263980 + Note that isapnp.rc supports only 2.6 kernel, so we can use --show-depends + in it. + + -- Fumitoshi UKAI Sat, 7 Aug 2004 01:33:53 +0900 + +hotplug (0.0.20040329-13) unstable; urgency=low + + * fix isapnp.rc + closes: Bug#261790 + * debian/patches/052_module_name_for_blacklist + fix handling '-' or '_' in module name for blacklisting + closes: Bug#263556 + * debian/patches/053_load_drivers_ignore_video + ignore modprobing modules in drivers/video if $IGNORE_PCI_CLASS_DISPLAY + closes: Bug#261958 + * add cs.po + closes: Bug#260385 + * update nl.po pt_BR.po + closes: Bug#260287, Bug#262598 + + -- Fumitoshi UKAI Fri, 6 Aug 2004 02:03:20 +0900 + +hotplug (0.0.20040329-12) unstable; urgency=low + + * Install the isapnp modprobe aliases in the right place. + * New patch 012_usb.rc_fix_coldplugging to generate more correct + coldplugging events for USB. Requires kernel >= 2.6.7. + Remove obsolete patches 012_usb.rc_no_usbmodules and + 012_usb.rc_try_all_interfaces. + (Closes: #243716, #245500, #243716, #243716, #248900, #237952, #248304) + (Closes: #252287, #253927) + * Removed patch 009_usb.agent_remover, it's broken (the $DEVPATH does + not exist anymore on removal) and useless because now $DEVICE should + always be generated. (Closes: #248070) + * Create the net.enable flag file in postinst. (Closes: #256897) + * Updated patch 050_net.agent_ifupdown to make net.ifup print a debug + message only if net.enable does not exist yet. (Closes: #256893) + * Updated patch firmware_dirs to search for firmware files in + /usr/local/lib/firmware/ too. (Closes: #257849) + * New patch 017_pci.rc_pcimodules_once to run pcimodules only once on + 2.4 systems. (Closes: #259488) + * Updated po templates: da, fr. (Closes: #257867, #259141) + * Updated isapnp.rc to support blacklisting by module name. + Patch courtesy of Santi Béjar. (Closes: #257043) + * Depend on grep >= 2.5.1.ds1-2, which fixes -q. (Closes: #257723) + + -- Marco d'Itri Sun, 18 Jul 2004 01:20:44 +0200 + +hotplug (0.0.20040329-11ubuntu10) warty; urgency=low + + * [debian/patches/firmware_dirs] Use /lib/hotplug/firmware, rather than + /lib/firmware, since it makes a bit more sense and that's where the new + kernel has placed the firmware + + -- Matt Zimmerman Mon, 27 Sep 2004 17:05:54 -0700 + +hotplug (0.0.20040329-11ubuntu9) warty; urgency=low + + * Remove debian/patches/pci_agent_perl; it needs to be modified to fall back + to using the shell exclusively if perl is not available yet (e.g., /usr is + on an NFS mount) + + -- Matt Zimmerman Tue, 21 Sep 2004 17:28:49 -0700 + +hotplug (0.0.20040329-11ubuntu8) warty; urgency=low + + * debian/hotplug.init: Fixed #1082 + * debian/hotplug.init: Fixed several exitstatus bugs + * debian/hotplug.init: Lower kernel printk level if non VERBOSE + + -- Nathaniel McCallum Tue, 7 Sep 2004 18:17:36 -0400 + +hotplug (0.0.20040329-11ubuntu7) warty; urgency=low + + * Rewrite pci_map_modules in pci.agent in Perl, much faster + + -- Matt Zimmerman Mon, 6 Sep 2004 17:45:33 -0700 + +hotplug (0.0.20040329-11ubuntu6) warty; urgency=low + + * Added versioned depend on lsb-base + + -- Nathaniel McCallum Fri, 3 Sep 2004 14:54:50 -0400 + +hotplug (0.0.20040329-11ubuntu5) warty; urgency=low + + * debian/hotplug.init: pretty initscript + + -- Nathaniel McCallum Fri, 3 Sep 2004 10:57:52 -0400 + +hotplug (0.0.20040329-11ubuntu4) warty; urgency=low + + * Patch from Herbert Xu to search for firmware with kernel version numbers + + -- Matt Zimmerman Wed, 1 Sep 2004 11:30:18 -0700 + +hotplug (0.0.20040329-11ubuntu3) warty; urgency=low + + * Blacklist the eth1394 module; it causes more confusion than it is worth by + default + + -- Matt Zimmerman Wed, 1 Sep 2004 09:51:23 -0700 + +hotplug (0.0.20040329-11ubuntu2) warty; urgency=low + + * Sync isapnp.rc with 0.0.20040329-14 (Closes: Warty#839) + + -- Matt Zimmerman Wed, 25 Aug 2004 08:35:38 -0700 + +hotplug (0.0.20040329-11ubuntu1) warty; urgency=low + + * Blacklist i810-tco (2.4.x driver corresponding to i8xx_tco in 2.6.x) + (Closes: Debian#264552, Warty#605) + + -- Matt Zimmerman Mon, 23 Aug 2004 15:22:49 -0700 + +hotplug (0.0.20040329-11) unstable; urgency=medium + + * Do not make the init script exit if a rc script fails. (Closes: #256553) + + -- Marco d'Itri Mon, 28 Jun 2004 20:38:29 +0200 + +hotplug (0.0.20040329-10) unstable; urgency=medium + + * This time, install net.ifup. (Closes: #256514) + * Fix a typo in net.agent. (Closes: #256394) + + -- Marco d'Itri Sun, 27 Jun 2004 19:34:26 +0200 + +hotplug (0.0.20040329-9) unstable; urgency=medium + + * Added support for boot time synthesis of isapnp events. + * patches/blacklist: added usbmouse and usbkbd. closes: Bug#242012 + * patches/blacklist: added all watchdog drivers. closes: Bug#249600 + * hotplug.postinst: do not fail when $STATIC_MODULE_LIST contains a slash. + closes: #248836 + * Conflict with alsa-base << 1.0.4-2, which blacklists OSS drivers. + closes: #246765 + * patches/hotplug.functions_typo: fix a typo. closes: #246911 + * New/updated debconf translations: ru, tr, de, ja. + closes: #250513, #246074, #244510, #244337 + * Search for firmwares in /lib/firmware/ too, to allow firmware loading + before /usr has been mounted. closes: #245100 + * patches/pci_agent_direct: in pci.rc, call pci.agent instead of + /sbin/hotplug. closes: #243117 + * patches/050_net.agent_ifupdown updated with new code from Thomas Hood + to fix many issues in network interfaces handling. + closes: #244615, #244617, #244954, #249542, #249170 + * Rearranged the messages printed by the init script in the hope they + will be less confusing. closes: #247658, #247972, #249457 + * patches/012_usb.rc_no_usbmodules: do not depend on the usbmodules + program when using 2.6 kernels. closes: #243702 + + -- Marco d'Itri Sat, 26 Jun 2004 15:04:09 +0200 + +hotplug (0.0.20040329-8) unstable; urgency=low + + * patches/050_net.agent_ifupdown: update, check "ifup -a" + * debian/control: add ifrename to suggests + closes: Bug#242914 + + -- Fumitoshi UKAI Sun, 11 Apr 2004 00:06:04 +0900 + +hotplug (0.0.20040329-7) unstable; urgency=low + + * patches/modprobe_q: deleted + * patches/015_load_drivers_mesg_format: added + * debian/hotplug.init: fix message format + closes: Bug#241681 + + * README.Debian: update + * debian/templates: modify net_agent_policy + + -- Fumitoshi UKAI Wed, 7 Apr 2004 23:30:32 +0900 + +hotplug (0.0.20040329-6) unstable; urgency=low + + * README.Debian: update + * debian/templates: change use_net_liface to net_agent_policy + * debian/config: ditto + * debian/hotplug.postinst: ditto + * patches/050_net.agent_ifupdown: ditto + initialize ifstate.hotplug properly + + -- Fumitoshi UKAI Wed, 7 Apr 2004 00:19:51 +0900 + +hotplug (0.0.20040329-5) unstable; urgency=low + + * debian/templates: update hotplug/use_net_liface + closes: Bug#242167 + * patches/016_pci.rc_ignore_pci_class_display: + fix test on $IGNORE_PCI_CLASS_DISPLAY. + closes: Bug#242244 + * patches/012_usb.rc_try_all_interfaces: + fix typo. s/$device/$intf/ + + -- Fumitoshi UKAI Tue, 6 Apr 2004 00:53:15 +0900 + +hotplug (0.0.20040329-4) unstable; urgency=low + + * debian/hotplug.init: don't check $runlevel here + * patches/051_check_runlevel: check $runlevel + + * debian/templates: add ignore_pci_class_display + * debian/config: add ignore_pci_class_display + * debian/hotplug.postinst: add ignore_pci_class_display + * patches/016_pci.rc_ignore_pci_class_display + ignore PCI_CLASS_DISPLAY* for coludplugging + closes: Bug#241765, Bug#238321 + + * debian/templates: add net_liface + * debian/config: add use_net_liface + * debian/hotplug.postinst: add use_net_liface + * patches/050_net.agent_ifupdown. + LIFACE can be configured. closes: Bug#241773 + preserve ifstate to ifstate.hotplug for rcS sequences. + net.rc added + + * patches/015_ieee1394.agent_check_env. check $VENDOR_ID + closes: Bug#204062 + * patches/012_usb.agent_check_drivers. fix wrong variable + closes: Bug#237952 + * patches/006_open_fds: deleted. already included in upstream + + -- Fumitoshi UKAI Sun, 4 Apr 2004 04:11:49 +0900 + +hotplug (0.0.20040329-3) unstable; urgency=low + + * debian/hotplug.postinst + preserve /etc/default/hotplug + closes: Bug#240582 + anyway, current debconf configurations are deprecated, and + I plan to delete these configuration variables in future. + If you need something to load at start time, use /etc/modules instead. + * debian/hotplug.postinst + move deprecated /etc/hotplug/usb.usermap.local + to /etc/hotplug/usb/local.usermap + closes: Bug#241144 + * debian/hotplug.dirs: add /etc/hotplug/blacklist.d + patches/014_load_drivers_blacklist_dir + blacklist can be added by other packages, such as ALSA + closes: Bug#241225 + * patches/013_load_drivers_check_module_dup + patches/012_usb.agent_check_driver + don't load drivers several times. + closes: Bug#232909, Bug#237952, Bug#241326 + * patches/012_usb.rc_try_all_interfaces + for TYPE=0/* USB devices, it will have several interfaces, so + try them at startup time. problem reported by mat@nask.pl + * patches/012_pci.rc_return_value + backported + * patches/011_hotplug.functions_quote_loaded + backported + + -- Fumitoshi UKAI Fri, 2 Apr 2004 02:49:20 +0900 + +hotplug (0.0.20040329-2) unstable; urgency=low + + * patches/010_load_drivers_module_name: $MODULE needs s/-/_/g to + match with lsmod output. + closes: Bug#241218 + * patches/009_usb.agent_remover: use $DEVPATH for $REMOVER + closes: Bug#238198 + * patches/011_usb.rc_dont_force_hcds: don't use debug_mesg + + -- Fumitoshi UKAI Thu, 1 Apr 2004 02:52:48 +0900 + +hotplug (0.0.20040329-1) unstable; urgency=low + + * New upstream release + * patches/000_remove_gettext: updated + * patches/050_net.agent_ifupdown: updated, support ifrename + * patches/007_ieee1394.agent_conversion_fix: deleted, applied in upstream + * patches/007_input.agent_fix_bits: ditto + * patches/007_input.rc_check_procfs: ditto + * patches/007_pci.rc_test_fix: ditto + * patches/007_scsi.agent_bashism_fix: ditto + * patches/007_usb.agent_small_fix: ditto + * patches/009_usb.agent_sysfs_fix: ditto + * patches/010_usb.rc_sysfs_coldplug: ditto + * patches/quote_firmware_name: ditto + + * patches/009_input.agent_ignore_no_bits: added + closes: Bug#204062 + + -- Fumitoshi UKAI Wed, 31 Mar 2004 00:37:09 +0900 + +hotplug (0.0.20040311-12) unstable; urgency=low + + * patches/011_usb.rc_dont_force_hcds: usb-uhci was blacklisted, so + it should not check blacklist here? + + -- Fumitoshi UKAI Fri, 26 Mar 2004 01:59:16 +0900 + +hotplug (0.0.20040311-11) unstable; urgency=low + + * patches/011_usb.rc_dont_force_hcds: check /proc/bus/usb/devices whether + HCDs already loaded or not. + closes: Bug#239841 + * README.Debian: updated + closes: Bug#239937 + + -- Fumitoshi UKAI Fri, 26 Mar 2004 01:38:18 +0900 + +hotplug (0.0.20040311-10) unstable; urgency=low + + * debian/rules: no start in installation/ugprade. + closes: Bug#239317, closes: Bug#239017 + * debian/config: fix usbmodules for 2.6 kernel. + delete usbd_enable. It is not used any more. + * debian/templates: delete usbd_enable + + -- Fumitoshi UKAI Tue, 23 Mar 2004 00:10:04 +0900 + +hotplug (0.0.20040311-9) unstable; urgency=low + + * patches/008_mesg_logging: log to tty and syslog + * patches/050_net.agent_ifupdown: ifdown also uses $LIFACE + * hotplug.dirs: add /usr/lib/hotplug/firmware + closes: Bug#238783 + + -- Fumitoshi UKAI Sun, 21 Mar 2004 02:15:39 +0900 + +hotplug (0.0.20040311-8) unstable; urgency=low + + * debian/rules: start only runlevel S, order 40 + * hotplug.preinst: move rcS.d/S36hotplug -> rcS.d/S40hotplug + + * Merged Marco d'Itri's work. + * patches/050_net.agent_ifupdown: renamed from 050_ifupdown, quote strings + * patches/050_ifupdown, patches/050_net.agent_ignore_runlevelS: removed + * patches/011_usb.rc_dont_force_hcds: stops force loading all USB + Host Controller Drivers when running a 2.6 kernel. + closes: Bug#204581, Bug#238198 + * debian/scripts/lib: fix for CVS + * patches/sbin_hotplug_cleanup: no need to test -f and exit 0 + * patches/000_remove_gettext: remove bash gettext markers. + patches/007_input.rc_check_procfs + patches/007_pci.rc_test_fix + * hotplug.postrm: no need to remove /etc/nohotplug + * hotplug.init: check /proc/sys/kernel/hotplug at first. + + -- Fumitoshi UKAI Thu, 18 Mar 2004 12:10:48 +0900 + +hotplug (0.0.20040311-7) unstable; urgency=low + + * input.agent: fix driverInfo parsing + closes: Bug#238041, Bug#238088 + + -- Fumitoshi UKAI Mon, 15 Mar 2004 23:30:23 +0900 + +hotplug (0.0.20040311-6) unstable; urgency=low + + * usb.rc: hopefully fix usb cold plugging. + closes: Bug#236521 + * usb.agent: fix wrong assumption format of sysfs usb attrs + closes: Bug#237899, Bug#237951 + + -- Fumitoshi UKAI Mon, 15 Mar 2004 00:37:18 +0900 + +hotplug (0.0.20040311-5) unstable; urgency=low + + * input.agent: fix ledBits parsing + + -- Fumitoshi UKAI Sun, 14 Mar 2004 03:05:28 +0900 + +hotplug (0.0.20040311-4) unstable; urgency=low + + * don't use /etc/nohotplug any more. + closes: Bug#237750, Bug#226441 + * ieee1394.agent: fix misplaced coversion code. + closes: Bug#237747 + * input.agent: fix bits parse bug + closes: Bug#237770, Bug#237807 + * hotplug.init: check /proc/sys/kernel/hotplug + closes: Bug#237811 + * add danish debconf template translation + closes: Bug#232861 + + -- Fumitoshi UKAI Sun, 14 Mar 2004 02:28:17 +0900 + +hotplug (0.0.20040311-3) unstable; urgency=low + + * don't stop when one subsystem failed to start. + closes: Bug#237707 + * fix pci.rc: [: missing ']'. + closes: Bug#237708 + * fix input.agent: some modulemap parameter may not be interger. + closes: Bug#237719 + + -- Fumitoshi UKAI Sat, 13 Mar 2004 14:15:00 +0900 + +hotplug (0.0.20040311-2) unstable; urgency=low + + * debian/hotplug.init: 'readlink -f' has been changed not to work + when real file (file pointed by symlink) doesn't exists. + * Use md's hotplug package. closes: Bug#236237 + * fix bashism in scsi.agent + + -- Fumitoshi UKAI Sat, 13 Mar 2004 02:37:31 +0900 + +hotplug (0.0.20040311-1) unstable; urgency=low + + * New upstream release. + * Repackaged for DBS. The original .diff.gz has been split in many pieces. + * Removed obsolete "Suggests: kudzu, fxload | hotplug-utils" line. + * Priority raised to standard. + * Removed old code to support upgrades from hotplug < 0.0.20010919-4. + * Improved and cleaned up the init script. + * Removed handling of the $USBD_ENABLE variable from postinst because + it has been useless for two years. + + -- Marco d'Itri Fri, 12 Mar 2004 01:54:33 +0100 + +hotplug (0.0.20040105-3) unstable; urgency=low + + * etc/hotplug/usb.handmap: remove empty line. + closes: Bug#231889, Bug#231674 + + -- Fumitoshi UKAI Mon, 9 Feb 2004 22:56:51 +0900 + +hotplug (0.0.20040105-2) unstable; urgency=low + + * etc/hotplug/hotplug.functions: env is defined as function when + /usr/bin/env not found. + closes: Bug#231431 + * debian/hotplug.init: no need to do test -L. readlink -f always + returns actual pathname. Suggested by Thomas Hood + + -- Fumitoshi UKAI Sat, 7 Feb 2004 00:56:16 +0900 + +hotplug (0.0.20040105-1) unstable; urgency=low + + * New upstream release. closes: Bug#228642 + * debian/control: add "Task: desktop". closes: Bug#231110 + * etc/hotplug/blacklist: add evbug. + closes: Bug#230665, Bug#231203, Bug#227391, Bug#226875, Bug#226988, Bug#230375, Bug#229234 + * debian/postinst: fix typo in /etc/default/hotplug. + closes: Bug#229367 + * debian/config: strip . in STATIC_MODULE_LIST. closes: Bug#227577 + * etc/hotplug/hotplug.functions: modprobe dry run uses -q options + and recent version of modutils don't emit error message to syslog + with -q & -s. closes: Bug#201419 + * do ". ./hotplug.functions" instead of ". hotplug.functions" + bash's test -t requires file descriptor(?), so do "test -t 1" + closes: Bug#217044 + * etc/hotplug/input.rc: ignore input_boot_events + when /proc/bus/input not found. closes: Bug#219161, Bug#223424 + * etc/hotplug/usb.agent: ignore empty line. closes: Bug#221739, Bug#206136 + * etc/hotplug/firmware.agent: quote $FORMWARE_DIR/$FORMWARE. + mkdir empty usr/lib/hotplug/firmware. closes: Bug#223232 + * etc/hotplug/usb.agent: ignore if sysfs is not mounted or failed to + populated attributes. closes: Bug#223992 + * etc/hotplug/usb.rc: mkdir /var/run/usb if not found in maybe_start_usb + closes: Bug#228911 + * etc/hotplug/hotplug.functions: use export if /usr/bin/env not found. + closes: Bug#230488 + * debian/postinst: remove old configuration file usb.usermap. + closes: Bug#227490, Bug#191707 + * debian/hotplug.init: /etc/nohotplug may be symlink. closes: Bug#200502 + * etc/hotplug/usb.handmap: + add Saitek P750 game pad entry. closes: Bug#216548 + add M-Audio Midisport 1x1. closes: Bug#220246 + * debian/po/nl.po: added. closes: Bug#217583 + * debian/po/pt_BR.po: updated: closes: Bug#219841 + + -- Fumitoshi UKAI Fri, 6 Feb 2004 02:11:24 +0900 + +hotplug (0.0.20031013-2) unstable; urgency=medium + + * bashism scripts use #!/bin/bash : pci.rc, usb.rc firmware.agent + closes: Bug#216959 + + -- Fumitoshi UKAI Wed, 22 Oct 2003 12:11:51 +0900 + +hotplug (0.0.20031013-1) unstable; urgency=low + + * add etc/hotplug/input.{agent,rc} + * etc/hotplug/usb.agent: do nothing for HID devices on linux 2.6 + * update README.Debian: closes: Bug#216414 + * fix comment in etc/hotplug/net.agent + * update debian/po/fr.po. closes: Bug#216153 + + -- Fumitoshi UKAI Mon, 20 Oct 2003 00:19:56 +0900 + +hotplug (0.0.20031008-2) unstable; urgency=low + + * fix net.agent typo: closes: Bug#215465 + + -- Fumitoshi UKAI Mon, 13 Oct 2003 14:22:40 +0900 + +hotplug (0.0.20031008-1) unstable; urgency=low + + * add firmware.agent + * run updfstab (in kudzu) if it exists + suggests: kudzu + * add some extra joystick devices in usb.handmap + closes: Bug#184880 + * add some wacom tablets for evdev in usb.handmap + * add usblcd in usb.handmap + * exclude tunl*/tun*/tap* for hotplug network devices + * add dasd (s390 stuff) tape and dasd agent + * improve debconf templates. thanks to Joey Hess. closes: Bug#215018 + * update ja.po + + -- Fumitoshi UKAI Sat, 11 Oct 2003 00:00:37 +0900 + +hotplug (0.0.20030924-2) unstable; urgency=low + + * etc/hotplug/hotplug.functions (load_drivers): + fix log message when module already loaded. closes: Bug#213461 + * add debian/po/ja.po: closes: Bug#214039 + + -- Fumitoshi UKAI Sun, 5 Oct 2003 02:21:59 +0900 + +hotplug (0.0.20030924-1) unstable; urgency=low + + * sync with CVS head + * add debian/po/fr.po: closes: Bug#212804 + + -- Fumitoshi UKAI Sat, 27 Sep 2003 01:23:48 +0900 + +hotplug (0.0.20030805-4) unstable; urgency=low + + * debian/templates: not use "answer Yes/No" in debconf templates + closes: Bug#211433 + * etc/hotplug/usb.rc: print which device are sync at start time. + closes: Bug#211001 + + -- Fumitoshi UKAI Sat, 20 Sep 2003 23:52:46 +0900 + +hotplug (0.0.20030805-3) unstable; urgency=low + + * hotplug.init: don't stop subsystem when halt or reboot + closes: Bug#160507, Bug#192367 + * net.agent: add comments about LIFACE='=hotplug', to see README.Debian. + * debian/control: depends modutils | module-init-tools for linux 2.6.x + closes: Bug#207343 + * po-debconf'ed + + -- Fumitoshi UKAI Sun, 14 Sep 2003 03:25:47 +0900 + +hotplug (0.0.20030805-2) unstable; urgency=low + + * hotplug.functions: we don't use awk because /usr may not available + * pci.agent: use sed instead of awk + * usb.agent: use sed instead of awk. + * usb.agent: fix interpretation of hex values (PRODUCT and sysfs) + * usb.rc: fix coldplug on 2.6 (no lister defined) + + -- Fumitoshi UKAI Fri, 8 Aug 2003 02:34:06 +0900 + +hotplug (0.0.20030805-1) unstable; urgency=low + + * new upstream release + usb.agent: support linux kernel 2.6.x: closes: Bug#204165 + * postrm: don't rm -rf /etc/hotplug. closes: Bug#202057 + * add subsys subdirectories to /etc/hotplug.d/. closes: Bug#202065 + * hotplug.init: do not include /usr dirs on PATH. closes: Bug#200499 + * usb.rc: check usbfs in /proc/filesystems to mount usbfs. closes: Bug#197908 + + -- Fumitoshi UKAI Thu, 7 Aug 2003 02:55:46 +0900 + +hotplug (0.0.20030501-1) unstable; urgency=low + + * new upstream release + closes: Bug#196777, Bug#198391 + * net.agent: called with ACTION=[add or remove] with linux kernel 2.6.x + closes: Bug#201643 + * README.Debian: improved. + closes: Bug#200891 + * usb.rc: use [[:space:]] + closes: Bug#200768 + * hotplug.8: fix typos + closes: Bug#200494 + * hotplug.init: + - use echo instead of touch, because touch is in /usr/bin + closes: Bug#200499 + - remove help arguments + closes: Bug#200490 + (not fixed to change exit 3, because debian-policy doesn't say that) + - merge restart to force-reload + closes: Bug#200492 + + -- Fumitoshi UKAI Sat, 19 Jul 2003 06:32:50 +0900 + +hotplug (0.0.20030117-7) unstable; urgency=low + + * etc/hotplug/hotplug.functions, etc/hotplug/usb.rc: + unset I_WANT_A_BROKEN_PS + PS_PERSONALITY=linux + closes: Bug#188701 + + -- Fumitoshi UKAI Sat, 12 Apr 2003 22:58:03 +0900 + +hotplug (0.0.20030117-6) unstable; urgency=low + + * debian/preinst: don't create usb.usermap.local + user can put usermap in /etc/hotplug/usb/*.usermap + + -- Fumitoshi UKAI Mon, 7 Apr 2003 23:13:07 +0900 + +hotplug (0.0.20030117-5) unstable; urgency=low + + * remove .svn directories, closes: Bug#187377 + + -- Fumitoshi UKAI Fri, 4 Apr 2003 02:39:32 +0900 + +hotplug (0.0.20030117-4) unstable; urgency=low + + * fix init.d script message. closes: Bug#184786 + + -- Fumitoshi UKAI Sat, 15 Mar 2003 16:08:56 +0900 + +hotplug (0.0.20030117-3) unstable; urgency=low + + * debian/config: fix getting available usb modules. closes: Bug#184699 + * net.agent: check invoked via ifup. + * debian/control: depends: procps + + -- Fumitoshi UKAI Fri, 14 Mar 2003 23:54:57 +0900 + +hotplug (0.0.20030117-2) unstable; urgency=low + + * add note about ifup =hotplug and how to configure + /etc/network/interfaces for hotplug in /usr/share/doc/hotplug/README.Debian + In short, you need to add /etc/network/interfaces if you want + that hotplug automatically up the network interface. + mapping hotplug + script /bin/grep + map eth0 + Then hotplug will up eth0 as do in old version. + see also: + http://lists.debian.org/debian-devel/2003/debian-devel-200303/msg00212.html + closes: Bug#183141, Bug#108857 + + Thanks Thomas Hood and Anthony Towns + + -- Fumitoshi UKAI Thu, 6 Mar 2003 00:08:02 +0900 + +hotplug (0.0.20030117-1) unstable; urgency=low + + * cvs current version + * /etc/hotplug/blacklist installed, closes: Bug#180521 + * delete update-usb.usermap, use /etc/hotplug/usb/*.usermap, + closes: Bug#168199, Bug#182783 + * /etc/hotplug/net.agent: + ignore ipsec, closes: Bug#132224 + ifup $INTERFACE=hotplug + * /etc/hotplug/pci.agent: find all matching modules, closes: Bug#135823 + * /etc/hotplug/usb.agent: always try usermap, closes: Bug#155537 + * /etc/hotplug/hotplug.functions: delete type -p + /etc/hotplug/{usb,pci}.rc: delete type -p + /etc/hostplug/usb.agent: use HOTPLUG_USB_WAIT, + if you're sure, you may change this value. + closes: Bug#182785 + * /etc/hotplug/usb.rc: ignore commented entry in fstab, closes: Bug#146783 + * /sbin/hotplug: hotplug open stdin,stdout,stderr, closes: Bug#180518 + wait agent execution if /etc/nohotplug exists + * /etc/init.d/hotplut + - check /sbin/hotplug, closes: Bug#177696 + - start: runlevel S, touch /etc/nohotplug + don't start twice + runlevel [1-6], rm /etc/nohotplug + - stop: set /bin/true to /proc/sys/kernel/hotplug + closes: Bug#137886 + * hotplug stop only runlevel 0(halt), 6(reboot), closes: Bug#182450 + * change /etc/default/hotplug.usb to /etc/default/hotplug + + -- Fumitoshi UKAI Sun, 2 Mar 2003 01:07:06 +0900 + +hotplug (0.0.20020826-1) unstable; urgency=low + + * New upstream release + - usb hotplugging also searches /etc/hotplug/usb/*.usermap + update-usb.usermap is deprecated. + * move /etc/logcheck/ignore.d/hotplug + to /etc/logcheck/ignore.d.workstation/hotplug. closes: Bug#152537 + * fix typo. closes: Bug#154157 + * hotplug-utils (fxload program) has been separated + + -- Fumitoshi UKAI Fri, 6 Sep 2002 22:47:15 +0900 + +hotplug (0.0.20020114-7) unstable; urgency=low + + * (debian/templates.ca) add catalon templates + closes: Bug#140019 + + -- Fumitoshi UKAI Wed, 27 Mar 2002 01:52:52 +0900 + +hotplug (0.0.20020114-6) unstable; urgency=high + + * etc/hotplug/ieee1394.agent: fix /tmp writable check. closes: Bug#138975 + + -- Fumitoshi UKAI Wed, 20 Mar 2002 02:00:55 +0900 + +hotplug (0.0.20020114-5) unstable; urgency=low + + * debian/update-usb.usermap: fix minor rediection bug + reported by Shaun Jackman + + -- Fumitoshi UKAI Mon, 11 Feb 2002 23:59:01 +0900 + +hotplug (0.0.20020114-4) unstable; urgency=low + + * debian/config: fix MODULE_DIR for 2.4 kernel + + -- Fumitoshi UKAI Fri, 25 Jan 2002 01:17:17 +0900 + +hotplug (0.0.20020114-3) unstable; urgency=low + + * fix typo in update-usb.usermap(8), closes: Bug#129897 + * add #include, fix prototype warnings, closes: Bug#124389 + * /etc/logcheck/ignore.d/hotplug, closes: Bug#121001 + + -- Fumitoshi UKAI Sun, 20 Jan 2002 00:21:41 +0900 + +hotplug (0.0.20020114-2) unstable; urgency=low + + * fix /etc/hotplug/usb.agent match_id algorithm + * fix /etc/init.d/hotplug messages. closes: Bug#129665 + + -- Fumitoshi UKAI Sat, 19 Jan 2002 03:42:42 +0900 + +hotplug (0.0.20020114-1) unstable; urgency=low + + * new upstream release + + -- Fumitoshi UKAI Thu, 17 Jan 2002 03:34:44 +0900 + +hotplug (0.0.20010919-11) unstable; urgency=low + + * sync with CVS version + * revert wc_l, since it's not necessary. we assume /usr mounted already + * define REMOVER for system without usbdevfs, closes: Bug#128121 + + -- Fumitoshi UKAI Tue, 15 Jan 2002 02:17:34 +0900 + +hotplug (0.0.20010919-10) unstable; urgency=low + + * wc -l is implemented as shell function + * Anyway, hotplug scripts requires some /usr programs such + as awk, find, so it should run after /usr mounted. + Changes init script to run after rcS.d/S35mountall.sh + * Closes: Bug#124059 + + -- Fumitoshi UKAI Sun, 16 Dec 2001 01:44:12 +0900 + +hotplug (0.0.20010919-9) unstable; urgency=low + + * fix typo in debian/update-usb.usermap, closes: Bug#122901 + + -- Fumitoshi UKAI Sat, 8 Dec 2001 23:25:57 +0900 + +hotplug (0.0.20010919-8) unstable; urgency=low + + * hotplug should start after S10checkroot.sh, closes: Bug#120348 + * apply patch from Plato + to fix munging of usb_bcdDevice for 2.2 kernels, closes: Bug#122761 + + -- Fumitoshi UKAI Fri, 7 Dec 2001 14:35:00 +0900 + +hotplug (0.0.20010919-7) unstable; urgency=high + + * create /usr/lib/hotplug + closes: Bug#121147, Bug#121151, Bug#121162 + + -- Fumitoshi UKAI Mon, 26 Nov 2001 13:11:35 +0900 + +hotplug (0.0.20010919-6) unstable; urgency=low + + * add update-usb.usermap + + -- Fumitoshi UKAI Sun, 25 Nov 2001 21:42:29 +0900 + +hotplug (0.0.20010919-5) unstable; urgency=low + + * debian/postinst: remove old system startup links and + relink new startup links, closes: Bug#89186 + * debian/postrm: remove /etc/hotplug dir, closes: Bug#120672 + + -- Fumitoshi UKAI Sat, 24 Nov 2001 01:33:27 +0900 + +hotplug (0.0.20010919-4) unstable; urgency=low + + * debian/hotplug.init: console message from init.d scripts + * debian/preinst: + start hotplug as soon as possible while upgrading + + -- Fumitoshi UKAI Wed, 14 Nov 2001 03:16:33 +0900 + +hotplug (0.0.20010919-3) unstable; urgency=low + + * debian/rules (binary-indep): + - dh_installinit -i + --no-restart-on-upgrade + -- 11 2 3 4 5 . start 4 1 S . stop 89 0 6 . + closes: Bug#96894: Hotplug upgrade can stall when USB device in use + closes: Bug#116033: upgrading hotplug via console login on USB keyboard locks you out! + closes: Bug#117240: Keyboard/Mouse inactive when going to single-user + + -- Fumitoshi UKAI Mon, 12 Nov 2001 22:57:30 +0900 + +hotplug (0.0.20010919-2) unstable; urgency=low + + * remove /etc/default/hotplug.usb on purge, closes: Bug#113820 + * invoke ifdown when unregister network interface, closes: Bug#113836 + + -- Fumitoshi UKAI Sun, 30 Sep 2001 20:47:16 +0900 + +hotplug (0.0.20010919-1) unstable; urgency=low + + * new upstream version + * (debian/template.pt_BR) add Brazilian portuguese templates + closes: Bug#110194 + * (debian/postinst) add db_stop, I hope it closes: Bug#112964 + * separate hotplug-utils + + -- Fumitoshi UKAI Sat, 22 Sep 2001 01:22:52 +0900 + +hotplug (0.0.20010424-4) unstable; urgency=low + + * (debian/hotplug.init) exit 0 at the end, closes: Bug#102996 + * add spanish tempaltes file + contributed by Carlos Valdivia Yage + closes: Bug#103047 + + -- Fumitoshi UKAI Tue, 3 Jul 2001 00:15:46 +0900 + +hotplug (0.0.20010424-3) unstable; urgency=low + + * add german templates file + contributed by Sebastian Feltel + closes: Bug#96087 + * add Japanese tempaltes + + -- Fumitoshi UKAI Mon, 7 May 2001 00:51:00 +0900 + +hotplug (0.0.20010424-2) unstable; urgency=low + + * add build-depends on debhelper with version (>= 3.0.0) for dh_installman + closes: Bug#95463 + * ifdown $INTERFACE for net.agent unregister, closes: Bug#95354 + + -- Fumitoshi UKAI Sat, 28 Apr 2001 01:46:28 +0900 + +hotplug (0.0.20010424-1) unstable; urgency=low + + * New usptream release + + -- Fumitoshi UKAI Fri, 27 Apr 2001 01:34:00 +0900 + +hotplug (0.0.20010228-3) unstable; urgency=low + + * fix typo in usb.agent, closes: #92317 + + -- Fumitoshi UKAI Sun, 1 Apr 2001 00:53:00 +0900 + +hotplug (0.0.20010228-2) unstable; urgency=low + + * change dependency: + - ifupdown, usbutils are downgraded to Recommends: + - pciutils is added to Recommends: + suggested by HAYASE Shigenori + + -- Fumitoshi UKAI Wed, 14 Mar 2001 12:03:33 +0900 + +hotplug (0.0.20010228-1) unstable; urgency=low + + * new upstream version + * move /etc/hotplug/usb.option to /etc/default/hotplug.usb + + -- Fumitoshi UKAI Sun, 4 Mar 2001 05:26:11 +0900 + +hotplug (0.0.20010214-4) unstable; urgency=HIGH + + * (postinst) fix syntax error near unexpected token `fi' + + -- Fumitoshi UKAI Sun, 25 Feb 2001 19:22:27 +0900 + +hotplug (0.0.20010214-3) unstable; urgency=low + + * (config,postinst) change debconf + check capability multiselect + * (control) add build-depends:, closes: Bug#86800 + + -- Fumitoshi UKAI Sat, 24 Feb 2001 05:12:42 +0900 + +hotplug (0.0.20010214-2) unstable; urgency=low + + * Initial public release. closes: Bug#86213 + + -- Fumitoshi UKAI Sat, 17 Feb 2001 20:45:56 +0900 + +hotplug (0.0.20010214-1.1) unstable; urgency=low + + * add dh_installdebconf + * (etc/hotplug/usb.rc) fix "ls: /proc/bus/usb: No such file or directory" + + -- Fumitoshi UKAI Sat, 17 Feb 2001 04:08:04 +0900 + +hotplug (0.0.20010214-1) unstable; urgency=low + + * New upstream release + * (debian/rules) use sed instead of modify original source + * (debian/control) depends ifupdown, usbutils, gawk + * not change #!/bin/bash to #!/bin/sh, because these scripts have some bashism + * use debconf + + -- Fumitoshi UKAI Sat, 17 Feb 2001 02:23:28 +0900 + +hotplug (0.0.20010123-1) unstable; urgency=low + + * Initial Release. + * /etc/sysconfig/usb in original source is moved to + /etc/hotplug/usb.option . + + -- HAYASE Shigenori Sat, 27 Jan 2001 13:34:53 +0900 +