From patchwork Wed Jun 20 04:09:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Mendoza-Jonas X-Patchwork-Id: 931923 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 ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 419WYZ2q0gz9s3C for ; Wed, 20 Jun 2018 14:09:22 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="eGoqHv9r"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="hSfvr8ZG"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 419WYZ1L35zF12F for ; Wed, 20 Jun 2018 14:09:22 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="eGoqHv9r"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="hSfvr8ZG"; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=mendozajonas.com (client-ip=66.111.4.26; helo=out2-smtp.messagingengine.com; envelope-from=sam@mendozajonas.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="eGoqHv9r"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="hSfvr8ZG"; dkim-atps=neutral Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 419WYP578BzF0mQ for ; Wed, 20 Jun 2018 14:09:13 +1000 (AEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id ABA7721D74; Wed, 20 Jun 2018 00:09:10 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 20 Jun 2018 00:09:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= mendozajonas.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=m4yAhMojUdsZ3W/LI +6FLcHE1r95qmdLuYoUr5FacNQ=; b=eGoqHv9rMU6Qg5odsncwBxEFglMKMuC0e nu+kJLrhlAhKNKKaaKTPP1KayzxijOCam3oajAgJsuIBu5J00uE67R5ldpZ6v3mW SCsiXOz1DmCfqK2bTloQTIrDfEehqbbeHlq11TOUXiE+n4/CpsNNkYLJeTmVr+5x 6statNY/+Vgw7BAjASep34kPfvuFTHYZthXSu9mrXpahTw11ST0DbjGAMDCgRLNm MFxvk8cHTdHCBuSzlfVbau5PhRoswcgGfX4dJNf6T4wxtoxcziZaIaTPyrg1I1h6 UHJCT9DukVdMZctzSq8TraSRC7vV8mQW1Lbhv7N1w41T/i/KcP8NA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=m4yAhMojUdsZ3W/LI +6FLcHE1r95qmdLuYoUr5FacNQ=; b=hSfvr8ZG4Dq2z7rv0MxkhlOhnKsrlB0d8 /I6kIYvMSy7PuYVF/waxdHdSptuFmZa94eacmkcmwPSqyjJHN5Xg/qc/In2YGtfG X1MFk2wmHI9BgfmFgd2rUCabgG/9NBmn/6ivkw4w8EU8DG1z51m9USJw3BPZoZUw itv5jgzkqxfI5y+ialbtzPsK4pXDXziSb3MLps5SPUdaj6TokRSzZY9Gpi0ki9bM /W0RRvuqeiv5tc1icCxcQPncMIQrxYVUYeVqmHoa4p76K2NtrewEGSIAYJTRu4Nw vWYoHV0DCGYOH4x6QhgaObpD9r6Q3QNRQ5QZfIh3NvWOEp2x0tmrg== X-ME-Proxy: X-ME-Sender: Received: from v4.ozlabs.ibm.com (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 5DA8310260; Wed, 20 Jun 2018 00:09:09 -0400 (EDT) From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH] discover/udev: Don't require ID_NET_NAME_PATH property Date: Wed, 20 Jun 2018 14:09:02 +1000 Message-Id: <20180620040902.12362-1-sam@mendozajonas.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 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" Drop the requirement for the ID_NET_NAME_PATH property since it prevents Petitboot from recognising virtio network devices, and is not otherwise used. Signed-off-by: Samuel Mendoza-Jonas --- discover/udev.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/discover/udev.c b/discover/udev.c index 45a8b56..883313b 100644 --- a/discover/udev.c +++ b/discover/udev.c @@ -241,7 +241,7 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev, static int udev_check_interface_ready(struct device_handler *handler, struct udev_device *dev) { - const char *name, *name_path, *ifindex, *interface, *mac_name; + const char *name, *ifindex, *interface, *mac_name; uint8_t *mac; char byte[3]; unsigned int i, j; @@ -253,13 +253,12 @@ static int udev_check_interface_ready(struct device_handler *handler, return -1; } - name_path = udev_device_get_property_value(dev, "ID_NET_NAME_PATH"); ifindex = udev_device_get_property_value(dev, "IFINDEX"); interface = udev_device_get_property_value(dev, "INTERFACE"); mac_name = udev_device_get_property_value(dev, "ID_NET_NAME_MAC"); /* Physical interfaces should have all of these properties */ - if (!name_path || !ifindex || !interface || !mac_name) { + if (!ifindex || !interface || !mac_name) { pb_debug("%s: interface %s missing properties\n", __func__, name); return -1;