From 3ba1b10a878b1e746620aebede8afcefcd53fd6c Mon Sep 17 00:00:00 2001 From: Christian Kujau Date: Mon, 20 Jul 2009 11:31:39 +0200 Subject: [PATCH] don't fail if nslookup is not found When nslookup is not available, execution would stop. This patch moves the check for nslookup and the _get_fqdn function into the ./new script (since this is the only place where it's used) and we don't fail any more but try to find out our FQDN without nslookup. Signed-off-by: Christian Kujau Signed-off-by: Christoph Hellwig --- common.config | 3 --- common.rc | 8 -------- new | 11 +++++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/common.config b/common.config index 15c7976e6..fecbabe1c 100644 --- a/common.config +++ b/common.config @@ -120,9 +120,6 @@ export UMOUNT_PROG="`set_prog_path umount`" 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" diff --git a/common.rc b/common.rc index 74a4900c7..0d655ca70 100644 --- a/common.rc +++ b/common.rc @@ -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() diff --git a/new b/new index 8e32824b0..08fc401e4 100755 --- a/new +++ b/new @@ -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 ..." -- 2.50.1