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

Bug#284223: discover1: modules with dash in name are not properly handled (patch)



Package: discover1
Version: 1.7.5
Severity: normal


Hi,

when booting, /etc/init.d/discover cuts module names with - before the
minus, so that modprobe thinks it's an option and brings an help
message.
I think the attached patch solves the problem (I can provide more
information, but I think, from the patch, the problem is obvious ;-) ).

Cheers, Eric

-- Package-specific info:
lspci:
0000:00:00.0 0600: 1106:0305 (rev 03)
0000:00:00.0 Host bridge: VIA Technologies, Inc. VT8363/8365 [KT133/KM133] (rev 03)
0000:00:01.0 0604: 1106:8305
0000:00:01.0 PCI bridge: VIA Technologies, Inc. VT8363/8365 [KT133/KM133 AGP]
0000:00:04.0 0601: 1106:0686 (rev 40)
0000:00:04.0 ISA bridge: VIA Technologies, Inc. VT82C686 [Apollo Super South] (rev 40)
0000:00:04.1 0101: 1106:0571 (rev 06)
0000:00:04.1 IDE interface: VIA Technologies, Inc. VT82C586A/B/VT82C686/A/B/VT823x/A/C PIPC Bus Master IDE (rev 06)
0000:00:04.2 0c03: 1106:3038 (rev 16)
0000:00:04.2 USB Controller: VIA Technologies, Inc. VT82xxxxx UHCI USB 1.1 Controller (rev 16)
0000:00:04.3 0c03: 1106:3038 (rev 16)
0000:00:04.3 USB Controller: VIA Technologies, Inc. VT82xxxxx UHCI USB 1.1 Controller (rev 16)
0000:00:04.4 0680: 1106:3057 (rev 40)
0000:00:04.4 Bridge: VIA Technologies, Inc. VT82C686 [Apollo Super ACPI] (rev 40)
0000:00:09.0 0280: 1048:1000 (rev 02)
0000:00:09.0 Network controller: Elsa AG QuickStep 1000 (rev 02)
0000:00:0a.0 0401: 1274:5880 (rev 02)
0000:00:0a.0 Multimedia audio controller: Ensoniq 5880 AudioPCI (rev 02)
0000:00:0b.0 0100: 1000:000f (rev 26)
0000:00:0b.0 SCSI storage controller: LSI Logic / Symbios Logic 53c875 (rev 26)
0000:00:0c.0 0200: 10ec:8139 (rev 10)
0000:00:0c.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL-8139/8139C/8139C+ (rev 10)
0000:00:0d.0 0400: 109e:036e (rev 02)
0000:00:0d.0 Multimedia video controller: Brooktree Corporation Bt878 Video Capture (rev 02)
0000:00:0d.1 0480: 109e:0878 (rev 02)
0000:00:0d.1 Multimedia controller: Brooktree Corporation Bt878 Audio Capture (rev 02)
0000:00:11.0 0180: 105a:0d30 (rev 02)
0000:00:11.0 Unknown mass storage controller: Promise Technology, Inc. PDC20265 (FastTrak100 Lite/Ultra100) (rev 02)
0000:01:00.0 0300: 10de:0181 (rev a4)
0000:01:00.0 VGA compatible controller: nVidia Corporation NV18 [GeForce4 MX 440 AGP 8x] (rev a4)

discover:

-- System Information:
Debian Release: 3.1
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.4.27-1-k7
Locale: LANG=en_IE.UTF-8, LC_CTYPE=en_IE.UTF-8 (charmap=UTF-8)

Versions of packages discover1 depends on:
ii  dash                        0.5.1-3      The Debian Almquist Shell
ii  debconf                     1.4.30.10    Debian configuration management sy
ii  discover1-data              1.2004.11.09 hardware lists for libdiscover1
ii  libc6                       2.3.2.ds1-18 GNU C Library: Shared libraries an
ii  libdiscover1                1.7.5        hardware identification library

-- debconf information:
* discover/manage_cdrom_devices: false
  discover/cdrom_base_mountpoint: /media/
  discover/cdrom_base_mountpoint_error:
--- discover.ORIG	2004-12-04 18:20:03.000000000 +0100
+++ discover	2004-12-04 18:21:15.000000000 +0100
@@ -156,7 +156,8 @@
         continue
     fi
 
-    MAPPED=$(eval "echo \$map_$MODULE")
+    over=$(echo $arg | sed 's/-/_/g')
+    MAPPED=$(eval "echo \$map_$over")
     if [ -n "$MAPPED" ]; then
         MODULE=$MAPPED
     fi

Reply to: