Bodo Eggert <[EMAIL PROTECTED]> writes:

> Ed L Cashin <[EMAIL PROTECTED]> wrote:
>
>> +if�test�-z�"$conf";�then
>> +��������conf="`find�/etc�-type�f�-name�udev.conf�2>�/dev/null`"
>> +fi
>> +if�test�-z�"$conf"�||�test�!�-r�$conf;�then
>> +��������echo�"$me�Error:�could�not�find�readable�udev.conf�in�/etc"�1>&2
>> +��������exit�1
>> +fi
>
> This will fail and print
> ---
> bash: test: etc/udev.conf: binary operator expected
> ---
> if there is more than one udev.conf.
>
> Fix: Always put quotes around variables.

Thanks.  With the changes below, it still will complain if it finds
more than one udev.conf, but only if /etc/udev/udev.conf doesn't
exist.


Quote all shell variables, and use /etc/udev/udev.conf if available.

Signed-off-by: Ed L. Cashin <[EMAIL PROTECTED]>

diff -uprN a/Documentation/aoe/udev-install.sh 
b/Documentation/aoe/udev-install.sh
--- a/Documentation/aoe/udev-install.sh 2005-01-20 09:14:58.000000000 -0500
+++ b/Documentation/aoe/udev-install.sh 2005-01-20 09:13:38.000000000 -0500
@@ -8,11 +8,15 @@ me="`basename $0`"
 # (or environment can specify where to find udev.conf)
 #
 if test -z "$conf"; then
-       conf="`find /etc -type f -name udev.conf 2> /dev/null`"
-fi
-if test -z "$conf" || test ! -r $conf; then
-       echo "$me Error: could not find readable udev.conf in /etc" 1>&2
-       exit 1
+       if test -r /etc/udev/udev.conf; then
+               conf=/etc/udev/udev.conf
+       else
+               conf="`find /etc -type f -name udev.conf 2> /dev/null`"
+               if test -z "$conf" || test ! -r "$conf"; then
+                       echo "$me Error: no udev.conf found" 1>&2
+                       exit 1
+               fi
+       fi
 fi
 
 # find the directory where udev rules are stored, often

-- 
  Ed L Cashin <[EMAIL PROTECTED]>

Reply via email to