[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#369598: marked as done (patches for init VERBOSE and -/_ mismatch in discover-modprobe)

Your message dated Fri, 11 Aug 2006 13:47:46 -0700
with message-id <E1GBdv0-0004ku-9i@spohr.debian.org>
and subject line Bug#369598: fixed in discover 2.1.0-1
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--- Begin Message ---
Package: discover
Version: 2.0.7-2.1
Severity: minor

Hello, here a 1st patch to let the init script honour the VERBOSE=no

--- discover.orig       2004-12-08 19:10:10.000000000 +0100
+++ discover    2006-05-30 20:04:17.000000000 +0200
@@ -6,8 +6,15 @@

 case "$1" in
-    discover-modprobe -v
+    if [ "$VERBOSE" = "no" ] ; then
+       discover-modprobe
+    else
+       discover-modprobe -v
+    fi
+    exit 0
+*)  echo "usage: /etc/init.d/discover [start|stop]"
+    exit 1

And here comes a patch to make discover-modprobe happy with - and _ in
module names (the modprobe doc says that using any of them in module
names should not make a difference). I wrote this patch because on one
of my systems snd_intel8x0 caused a little problem ...

--- discover-modprobe.orig      2005-04-24 15:33:52.000000000 +0200
+++ discover-modprobe   2006-05-30 19:54:03.000000000 +0200
@@ -57,7 +57,7 @@

 skip ()
-    echo ${skip} | grep -q $1
+    echo ${skip} | sed 's/-/_/g' | grep -q $1
     return $?

@@ -71,7 +71,7 @@
 # Determine if the module is already loaded is_loaded() {
-    if sed 's/^\([^ ]\+\).*/\1/' /proc/modules | grep -q "^${module}\$" ; then
+    if sed -e 's/^\([^ ]\+\).*/\1/' -e's/-/_/g' /proc/modules | grep -q "^${module}\$" ; then
@@ -127,7 +127,7 @@

 # Load the modules.
 for module_info in ${module_details}; do
-    module_name=$(echo ${module_info} | sed 's/^\([^ ]\+\).*/\1/')
+    module_name=$(echo ${module_info} | sed -e's/^\([^ ]\+\).*/\1/' -e's/-/_/g')
     if [ ${module_name} = "ignore" ] || [ ${module_name} = "unknown" ]; then


-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (500, 'testing'), (500, 'stable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16-14-amd
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)

Versions of packages discover depends on:
ii  libdiscover2                  2.0.7-2.1  hardware identification library

discover recommends no packages.

-- no debconf information

--- End Message ---
--- Begin Message ---
Source: discover
Source-Version: 2.1.0-1

We believe that the bug you reported is fixed in the latest version of
discover, which is due to be installed in the Debian FTP archive:

  to pool/main/d/discover/discover-udeb_2.1.0-1_i386.udeb
  to pool/main/d/discover/discover_2.1.0-1.diff.gz
  to pool/main/d/discover/discover_2.1.0-1.dsc
  to pool/main/d/discover/discover_2.1.0-1_i386.deb
  to pool/main/d/discover/discover_2.1.0.orig.tar.gz
  to pool/main/d/discover/libdiscover-dev_2.1.0-1_i386.deb
  to pool/main/d/discover/libdiscover2_2.1.0-1_i386.deb

A summary of the changes between this version and the previous one is

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 369598@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
Petter Reinholdtsen <pere@debian.org> (supplier of updated discover package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)

Hash: SHA1

Format: 1.7
Date: Fri, 11 Aug 2006 22:21:55 +0200
Source: discover
Binary: discover-udeb libdiscover2 discover libdiscover-dev
Architecture: source i386
Version: 2.1.0-1
Distribution: unstable
Urgency: low
Maintainer: Petter Reinholdtsen <pere@debian.org>
Changed-By: Petter Reinholdtsen <pere@debian.org>
 discover   - hardware identification system
 discover-udeb - hardware identification system (udeb) (udeb)
 libdiscover-dev - hardware identification library development files
 libdiscover2 - hardware identification library
Closes: 300906 304923 306169 307125 310944 335322 351381 363025 369598 382454
 discover (2.1.0-1) unstable; urgency=low
   [ Otavio Salvador ]
   * Remove the externals repositories.
   * Add a fresh copy of buildtools, portability and doctools dated
   * Add debian/update-buildsystem to allow us to sync with Progeny build
   * Fix build problem installing the bug script since the directory wasn't
     create at build time.
   * Cleanup the package building a bit and fix the problem using dh_strip.
   * Fix a compiler warning about signess with gcc-4.0.
   * Applied patch from Jean Christophe André <progfou@gmail.com> to fix
     already loaded module detection. (Closes: #307125)
   * Change place to store crashfile on /lib/discover/. (Closes: #306169)
   [ Petter Reinholdtsen ]
   * Convert discover-modprobe (called from init.d script) to use Linux
     Software Base functions when present.  Add suggest on lsb-base.
   * Add support for vendor default entries, to make it possible to
     return 'ati' and 'nv' drivers for unrecognized ATI and nVidia
     cards.  This includes a change to the DTD.  Patch from Daniel
     Stone and ubuntu.
   * Include reportbug helper script to get useful info in bug reports.
   [ Jeff Licquia ]
   * Add a mechanism for the sysdeps to pass information back to
     discover, and make that information available for query under
     the "device" data node.
   [ Petter Reinholdtsen ]
   * Take over this package from QA.
   * Add discover-aptinstall, installing hardware related
     debian packages.  (Closes: #382454)
   * Do not install init.d script, and remove traces of it if present.
     It is no longer useful as udev do a much better job based on the
     /lib/modules/*/modules.* files provided by the kernel.
     This make the boot order irrelevant. (Closes: #310944, #369598, #363025)
   * Add LSB info to the init.d script in the source directory, for those
     interested in using it.  (Closes: #335322)
   * Update Standards-Version from 3.6.2to 3.7.2.  No changes needed.
   * Remove directory /var/state/discover/ if it exist.  It haven't
     been used since version 1.2-1.  (Closes: #304923)
   * Teach discover-modprobe to handle modules with names which
     are a substring of other module names.  Patch from Branden Robinson.
     (Closes: #300906)
   * Remove vim instructions at the end of debian/changelog to keep lintian
   * Update to use debhelper 4.  Add ${misc:Depends} to depends lines.
   * Remove all traces of the obsolete cdrom question. (Closes: #351381)
 dfe6c977a4f7bcb96865e30f24cccccf 676 admin optional discover_2.1.0-1.dsc
 1b25a36a8984d461fe4a74b5c162ec31 650186 admin optional discover_2.1.0.orig.tar.gz
 59796d5036699d6ade08c507327c699b 99207 admin optional discover_2.1.0-1.diff.gz
 243bd7d6688793a0588c42daac94bbb8 305384 admin optional discover_2.1.0-1_i386.deb
 dff6b58872bd470cda417cce97d67618 98060 libs optional libdiscover2_2.1.0-1_i386.deb
 9c47f28219c1f315ca3c7c22bed7e4ef 112406 libdevel optional libdiscover-dev_2.1.0-1_i386.deb
 eed71e015c07b61b0dc1263aa60a6bd1 272324 debian-installer extra discover-udeb_2.1.0-1_i386.udeb

Version: GnuPG v1.4.5 (GNU/Linux)


--- End Message ---

Reply to: