From patchwork Tue Dec 18 01:02:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1014910 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43Jfs50Trlz9sC7 for ; Tue, 18 Dec 2018 12:03:04 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 6E9FE3E6F1E for ; Tue, 18 Dec 2018 02:03:01 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [217.194.8.6]) by picard.linux.it (Postfix) with ESMTP id 7B4293E6E73 for ; Tue, 18 Dec 2018 02:02:35 +0100 (CET) Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id 2D7CC14010C9 for ; Tue, 18 Dec 2018 02:02:35 +0100 (CET) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id CE073B093; Tue, 18 Dec 2018 01:02:34 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Tue, 18 Dec 2018 02:02:18 +0100 Message-Id: <20181218010220.2446-5-pvorel@suse.cz> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181218010220.2446-1-pvorel@suse.cz> References: <20181218010220.2446-1-pvorel@suse.cz> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-6.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-6.smtp.seeweb.it Subject: [LTP] [PATCH v3 4/6] net/dhcp: Check also default dhclient lease file path X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" /var/lib/dhclient/dhclient{6,}.leases is used on Fedora/RHEL/CentOS/Oracle Linux (since dhcp 4.0 in 2008) Check also default upstream path for dhclient on Linux. Signed-off-by: Petr Vorel --- testcases/network/dhcp/dhcp_lib.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/testcases/network/dhcp/dhcp_lib.sh b/testcases/network/dhcp/dhcp_lib.sh index b8611f49d..632b1a9b1 100755 --- a/testcases/network/dhcp/dhcp_lib.sh +++ b/testcases/network/dhcp/dhcp_lib.sh @@ -59,6 +59,7 @@ dhcp_lib_setup() stop_dhcp || tst_brk TBROK "Failed to stop dhcp server" dhclient_lease="/var/lib/dhclient/dhclient${TST_IPV6}.leases" + [ -f $dhclient_lease ] || dhclient_lease="/var/lib/dhcp/dhclient${TST_IPV6}.leases" if [ -f $dhclient_lease ]; then tst_res TINFO "backup dhclient${TST_IPV6}.leases" mv $dhclient_lease .