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

Bug#258922: sh -x trace?



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.

> ++ 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 :(

-- 
Joshua Kwan
? discover-init.diff
Index: discover/discover.init
===================================================================
RCS file: /cvsroot/pkg-discover/discover1/discover/discover.init,v
retrieving revision 1.17
diff -u -r1.17 discover.init
--- discover/discover.init	12 Jul 2004 02:00:56 -0000	1.17
+++ discover/discover.init	12 Jul 2004 18:18:24 -0000
@@ -99,9 +99,13 @@
             
 get_aliases_regexp() {
   searchmod="$(echo $1 | sed -e 's#\(-\|_\)#(-|_)#g')"
+  search=""
+  
   if [ -e "/etc/modprobe.conf" ]; then search="$search /etc/modprobe.conf"; fi
   if [ -e "/etc/modules.conf" ]; then search="$search /etc/modules.conf"; fi
-  grep -h '^alias' $search | ( while read dummy alias module; do
+
+  if [ -n "$search" ]; then
+    grep -h '^alias' $search | ( while read dummy alias module; do
       if [ "$dummy" = alias ]; then
         if [ "$1" = "$alias" ]; then
           echo "|$module"
@@ -115,6 +119,7 @@
         *) cat ;;
       esac
     )
+  fi
 }
 
 # Determine if the module is already loaded

Attachment: signature.asc
Description: Digital signature


Reply to: