From patchwork Wed Aug 10 07:13:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Mendoza-Jonas X-Patchwork-Id: 657616 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3s8MnT6WZtz9svs for ; Wed, 10 Aug 2016 17:13:33 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b=Bcj4ySM9; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3s8MnT4yS0zDqTp for ; Wed, 10 Aug 2016 17:13:33 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b=Bcj4ySM9; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Received: from mendozajonas.com (mendozajonas.com [188.166.185.233]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3s8MnQ2d3QzDqCZ for ; Wed, 10 Aug 2016 17:13:30 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b=Bcj4ySM9; dkim-atps=neutral Received: from skellige.ozlabs.ibm.com (unknown [122.99.82.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: sam@mendozajonas.com) by mendozajonas.com (Postfix) with ESMTPSA id 1CE45140055; Wed, 10 Aug 2016 15:13:25 +0800 (SGT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mendozajonas.com; s=mail; t=1470813206; bh=JTooXQhP6q7UssMB1btsDGOx0cuhTG9MqmWGcE1aCLc=; h=From:To:Cc:Subject:Date:From; b=Bcj4ySM9sTRc7xe8FtsWBJ8XUwWSXvIh75cn7Tc+LLyJxN9lnPUKarkxLvtzLLn8C d/CZAioKrvlSRdNYB72+KULuPpGaaeWsxhQBkjB+mkxxpCx5zbYfuVxazYUVZIy+mJ 2I1SDR//Uwo7Jgk0nOJ9C6NOc2VKKe8nvRXym27c= From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH] discover/network: Ignore tun devices Date: Wed, 10 Aug 2016 17:13:18 +1000 Message-Id: <20160810071318.12809-1-sam@mendozajonas.com> X-Mailer: git-send-email 2.9.2 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Mendoza-Jonas MIME-Version: 1.0 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" In some environments a default 'tun' device is created. Petitboot doesn't use this and it clutters up the list of network devices, so ignore it if it is encountered. Signed-off-by: Samuel Mendoza-Jonas --- discover/network.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/discover/network.c b/discover/network.c index 4b79015..2de96ec 100644 --- a/discover/network.c +++ b/discover/network.c @@ -515,6 +515,9 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg) return 0; } + /* ignore the default tun device in some environments */ + if (strncmp(ifname, "tun", strlen("tun")) == 0) + return 0; interface = find_interface_by_ifindex(network, info->ifi_index); if (!interface) {