Joshua Kwan <jkwan@rackable.com> writes: > On Mon, Jul 12, 2004 at 08:00:36PM +0200, Arnaud Vandyck wrote: >> many thanks to your quick reply. Also, I did install discover2 and there >> is no problem with it. Am I right? Is discover1 obsolet? > > discover1 is tuned to 2.4 and is used in the debian-installer. > So in a way it's obsolete in that Progeny has tossed it to us like a hot > potato, but it actually supports more buses and more new devices than > discover2 in the archive does now. I'm using 2.6?.. >> ++ grep -h '^alias' >> ++ read dummy alias module >> +++ uname -r >> ++ sed s/-/_/g > > Curses! Can you try applying this patch to /etc/init.d/discover? (the > diff is for the wrong name, but the whole thing is easy to hand-apply > anyway.) > > It should work. Just that I have been very, very bad about considering > the consequences of my changes in that shell script (hence 1.6.2 -> > 1.6.2.1 -> 1.6.2.2)... > > If it works, I'll upload 1.6.3 :( it's good, congratulations ;-) log attached Many thanks for the quick fix Cheers, -- Arnaud Vandyck
+ set -e + test -f /sbin/discover + CONFFILE=/etc/discover.conf + SKIPFILE=/etc/discover-autoskip.conf + INITFILE=/etc/default/discover + '[' -r /etc/default/discover ']' + . /etc/default/discover ++ MANAGE_CDROM_DEVICES=true ++ CDROM_BASE_MOUNTPOINT=/media/ + '[' -f /etc/discover.conf ']' ++ sed -n 's/#.*$//;s/^boot //p' /etc/discover.conf + TYPES=all ++ echo all ++ sed 's/,/ /g' + TYPES=all + echo -n 'Detecting hardware: ' Detecting hardware: ++ run_discover --module all ++ '[' -f /etc/discover.conf ']' +++ sed 's/#.*$//' /etc/discover.conf +++ grep -E '^(enable|disable)' +++ read action module ++ discover_uniq ++ local result= ++ IFS= ++ read module +++ '[' enable = enable ']' +++ echo --enable=pci,usb,ide,scsi +++ read action module +++ '[' enable = enable ']' +++ echo --enable=pcmcia +++ read action module +++ '[' enable = enable ']' +++ echo --enable=isa +++ read action module +++ '[' disable = enable ']' +++ '[' disable = disable ']' +++ echo --disable=parallel,serial +++ read action module ++ ARGUMENTS=--enable=pci,usb,ide,scsi --enable=pcmcia --enable=isa --disable=parallel,serial ++ discover --enable=pci,usb,ide,scsi --enable=pcmcia --enable=isa --disable=parallel,serial --module all ++ echo '' ++ unset ARGUMENTS ++ grep -q ' ' ++ result= ++ read module ++ echo ' ' ++ grep -q ' ' ++ read module ++ echo ' ' ++ grep -q 'yenta_socket ' ++ result= yenta_socket ++ read module ++ grep -q ' ' ++ echo ' yenta_socket ' ++ read module ++ echo ' yenta_socket ' ++ grep -q ' ' ++ read module ++ echo ' yenta_socket ' ++ grep -q 'sungem ' ++ result= yenta_socket sungem ++ read module ++ echo ' yenta_socket sungem ' ++ grep -q 'ide-scsi ' ++ result= yenta_socket sungem ide-scsi ++ read module ++ echo ' yenta_socket sungem ide-scsi ' ++ grep -q ' ' ++ read module ++ echo ' yenta_socket sungem ide-scsi ' ++ grep -q ' ' ++ read module ++ echo ' yenta_socket sungem ide-scsi ' ++ grep -q ' ' ++ read module ++ echo ' yenta_socket sungem ide-scsi ' ++ grep -q 'usb-ohci ' ++ result= yenta_socket sungem ide-scsi usb-ohci ++ read module ++ echo ' yenta_socket sungem ide-scsi usb-ohci ' ++ grep -q 'usb-ohci ' ++ read module ++ echo ' yenta_socket sungem ide-scsi usb-ohci ' ++ grep -q 'ehci-hcd ' ++ result= yenta_socket sungem ide-scsi usb-ohci ehci-hcd ++ read module ++ echo ' yenta_socket sungem ide-scsi usb-ohci ehci-hcd ' ++ grep -q ' ' ++ read module ++ echo ' yenta_socket sungem ide-scsi usb-ohci ehci-hcd ' ++ grep -q ' ' ++ read module ++ echo ' yenta_socket sungem ide-scsi usb-ohci ehci-hcd ' + MODULES= yenta_socket sungem ide-scsi usb-ohci ehci-hcd ++ uname -r ++ echo yenta_socket sungem ide-scsi usb-ohci ehci-hcd ++ sed -e 's/ide-scsi //' -e s/-/_/g + MODULES=yenta_socket sungem usb_ohci ehci_hcd + echo 'yenta_socket sungem usb_ohci ehci_hcd' yenta_socket sungem usb_ohci ehci_hcd + '[' -f /var/lib/discover/crash ']' + SKIPLIST= + test -f /etc/discover.conf + test -f /etc/discover-autoskip.conf + SKIPFILE= ++ sed -n 's/#.*$//;y/ / /;s/ */ /g;s/^ *skip //p' /etc/discover.conf + SKIPLIST=i810-tco + '[' yenta_socket = ignore ']' + '[' yenta_socket = unknown ']' + skip yenta_socket + echo i810-tco + grep -wq -e yenta_socket + is_loaded yenta_socket + module=yenta_socket ++ get_aliases_regexp yenta_socket +++ echo yenta_socket +++ sed -e 's#\(-\|_\)#(-|_)#g' ++ searchmod=yenta(-|_)socket ++ search= ++ '[' -e /etc/modprobe.conf ']' ++ '[' -e /etc/modules.conf ']' ++ '[' -n '' ']' + aliases= + sed 's/ .*$//' /proc/modules + grep -qE '^(yenta_socket)$' + echo 'Skipping already loaded module yenta_socket.' Skipping already loaded module yenta_socket. + continue + '[' sungem = ignore ']' + '[' sungem = unknown ']' + skip sungem + grep -wq -e sungem + echo i810-tco + is_loaded sungem + module=sungem ++ get_aliases_regexp sungem +++ echo sungem +++ sed -e 's#\(-\|_\)#(-|_)#g' ++ searchmod=sungem ++ search= ++ '[' -e /etc/modprobe.conf ']' ++ '[' -e /etc/modules.conf ']' ++ '[' -n '' ']' + aliases= + sed 's/ .*$//' /proc/modules + grep -qE '^(sungem)$' + echo 'Skipping already loaded module sungem.' Skipping already loaded module sungem. + continue + '[' usb_ohci = ignore ']' + '[' usb_ohci = unknown ']' + skip usb_ohci + echo i810-tco + grep -wq -e usb_ohci + echo 'Skipping unavailable/built-in usb_ohci module.' Skipping unavailable/built-in usb_ohci module. + continue + '[' ehci_hcd = ignore ']' + '[' ehci_hcd = unknown ']' + skip ehci_hcd + echo i810-tco + grep -wq -e ehci_hcd + is_loaded ehci_hcd + module=ehci_hcd ++ get_aliases_regexp ehci_hcd +++ echo ehci_hcd +++ sed -e 's#\(-\|_\)#(-|_)#g' ++ searchmod=ehci(-|_)hcd ++ search= ++ '[' -e /etc/modprobe.conf ']' ++ '[' -e /etc/modules.conf ']' ++ '[' -n '' ']' + aliases= + sed 's/ .*$//' /proc/modules + grep -qE '^(ehci_hcd)$' + echo 'Skipping already loaded module ehci_hcd.' Skipping already loaded module ehci_hcd. + continue + '[' true = true ']' ++ grep '/media/cdrom0 ' /proc/mounts ++ cut -f2 + mountsent= + '[' -z '' ']' + rm -rf /media/cdrom0 + CDNUM=0 ++ run_discover --device cdrom ++ '[' -f /etc/discover.conf ']' +++ sed 's/#.*$//' /etc/discover.conf +++ grep -E '^(enable|disable)' +++ read action module ++ sort +++ '[' enable = enable ']' +++ echo --enable=pci,usb,ide,scsi +++ read action module +++ '[' enable = enable ']' +++ echo --enable=pcmcia +++ read action module +++ '[' enable = enable ']' +++ echo --enable=isa +++ read action module +++ '[' disable = enable ']' +++ '[' disable = disable ']' +++ echo --disable=parallel,serial +++ read action module ++ ARGUMENTS=--enable=pci,usb,ide,scsi --enable=pcmcia --enable=isa --disable=parallel,serial ++ discover --enable=pci,usb,ide,scsi --enable=pcmcia --enable=isa --disable=parallel,serial --device cdrom ++ unset ARGUMENTS ++ echo /dev/hdc ++ sed 's/\/dev\/scd/\/dev\/sr/' + ALTCDROM=/dev/hdc + '[' '!' -e /dev/hdc ']' + '[' '!' -b /dev/hdc ']' + '[' -e /dev/cdrom0 ']' + '[' '!' -L /dev/cdrom0 ']' + ln -fs /dev/hdc /dev/cdrom0 + sed 's#.\+ \(.\+\) .\+ .\+ .\+ .\+$#\1#g' + grep -qs /media/cdrom0 + mkdir -p /media/cdrom0 + CDNUM=1 + '[' -e /dev/cdrom0 ']' + '[' -L /dev/cdrom ']' + ln -fs /dev/cdrom0 /dev/cdrom + sed 's#.\+ \(.\+\) .\+ .\+ .\+ .\+$#\1#g' + grep -qs '^/media/cdrom' + ln -fs /media/cdrom0 /media/cdrom
Attachment:
pgpjYY5S9n2Lv.pgp
Description: PGP signature