Re: xfstests: nslookup not found

Christian Kujau
2009-07-19T23:57:03Z

On Sun, 19 Jul 2009 at 14:20, Christoph Hellwig wrote:
> Can you resend a patch that just moves _get_fqdn and the check for
> nslookup from common* into the "new" script?

If I understand correctly, maybe something like this would be acceptable?

I was tempted to use "hostname -f" to give out the fqdn, but appaerently
not every hostname knows "-f" and I did not want to let the whole script
fail just because nslookup is not in place.

Christian.

--- common.config.orig 2009-07-19 21:43:15.000000000 +0200
+++ common.config 2009-07-19 21:43:31.000000000 +0200
@@ -120,9 +120,6 @@ export UMOUNT_PROG="`set_prog_path umoun
export FSSTRESS_PROG="`set_prog_path fsstress $PWD/ltp/fsstress`"
[ "$FSSTRESS_PROG" = "" ] && _fatal "fsstress not found"

-export NSLOOKUP_PROG="`set_prog_path nslookup`"
-[ "$NSLOOKUP_PROG" = "" ] && _fatal "nslookup not found"
-
export PERL_PROG="`set_prog_path perl`"
[ "$PERL_PROG" = "" ] && _fatal "perl not found"

--- common.rc.orig 2009-07-19 21:44:42.000000000 +0200
+++ common.rc 2009-07-19 21:45:06.000000000 +0200
@@ -330,14 +330,6 @@ _get_pids_by_name()
-e "/[0-9]:[0-9][0-9] *$1 /s/ .*//p"
}

-# fqdn for localhost
-#
-_get_fqdn()
-{
- host=`hostname`
- $NSLOOKUP_PROG $host | $AWK_PROG '{ if ($1 == "Name:") print $2 }'
-}
-
# fix malloc libs output
#
_fix_malloc()
--- new.orig 2009-07-19 21:43:20.000000000 +0200
+++ new 2009-07-20 01:45:51.000000000 +0200
@@ -32,6 +32,17 @@ _cleanup()
:
}

+# fqdn for localhost
+_get_fqdn()
+{
+ NSLOOKUP_PROG="`set_prog_path nslookup`"
+ if [ "$NSLOOKUP_PROG" = "" ]; then
+ getent hosts `uname -n` | awk '{print $2}'
+ else
+ $NSLOOKUP_PROG `hostname` | $AWK_PROG '{ if ($1 == "Name:") print $2 }'
+ fi
+}
+
if [ ! -f group ]
then
echo "Creating the group index ..."

--
BOFH excuse #274:

It was OK before you touched it.