From patchwork Wed May 9 05:37:03 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: 910664 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40glrZ3nBPz9s3q for ; Wed, 9 May 2018 15:53:02 +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="SqNK9aXW"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="OPIfWx3+"; 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 40glrZ1QBbzF27Q for ; Wed, 9 May 2018 15:53:02 +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="SqNK9aXW"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="OPIfWx3+"; 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.27; helo=out3-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="SqNK9aXW"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="OPIfWx3+"; dkim-atps=neutral Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40glVZ2qCdzF27L for ; Wed, 9 May 2018 15:37:26 +1000 (AEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 25A052299C; Wed, 9 May 2018 01:37:24 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 09 May 2018 01:37:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= mendozajonas.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=O1LkIe9LR6C89ICsOVpmFB9/gpC4qeOl8MgMdMEdv9k=; b=SqNK9aXW TeFEVQHQfLFnzio1THKuwf56HQAiNIrX6t/rf4AIQfmwyAl0EH/0ZoTamA7JKGHm Gi7/I5CaiwAUvybi+0bRqsT1W6cC8VjjSrEYYcO7UqVzbIHP6EbtPgH1mPHlQkbZ etQbHFRYtGsc2E2XGv/5/GrjHFXyws5VxEX189x2UeNMbpBUt8P+EzhZdvpy1u63 WU56pwln5xu/HEJ6Zs5Gwxz830unIzxrzvZYaRqehCml9jaKCa23ahmlosFwdqEu 5X+EeDf3Jugrfju3c7zBn58uRXXYEcHft9PmTkqwNPNtkXjfeFvfdDueTQFTbEFx kSrLapcUKj+nGw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=O1LkIe9LR6C89ICsOVpmFB9/gpC4qeOl8MgMdMEdv9k=; b=OPIfWx3+ 6+1HdxQ/X3J5lOi+/xcGWrrtX1i3OhSjkgfXdLhuMjnCuCeDXVFpbHeIzI2hCgBo DyIvmLYG4cb90XSYpMAe/hcRg1PNqfdoswONEybqDB4Um6pF6SVq2U4xaWYk1Zn1 hu+j2hcLMZ+KuajcleY4S86YY4WvPx6rTF3UYjvVSxpIEWcrNfXgKQFEQEni55uz SdV+YSg9ZPjf/8hlu9r6koNBpIJUeuYyqW9e+o0OqcRZzcPxlHjkRitrxsOjnkwy XI8FcbhSuYjXDTfRMSNVmIc4k3ZBqmhsqv5bXFId0VIxFWnWZsPEWcM0/kVMFKV+ Vqzs3FCPKiTa1w== X-ME-Sender: Received: from v4.ozlabs.ibm.com (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id E177510253; Wed, 9 May 2018 01:37:22 -0400 (EDT) From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH 5/7] discover/platform-powerpc: Add NVRAM parameter for IPv6 Date: Wed, 9 May 2018 15:37:03 +1000 Message-Id: <20180509053705.3143-6-sam@mendozajonas.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509053705.3143-1-sam@mendozajonas.com> References: <20180509053705.3143-1-sam@mendozajonas.com> 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" Add a new NVRAM parameter to signal which address scheme should be used. This is kept separate from petitboot,network to maintain some backwards compatibility for IPv4 configurations. Signed-off-by: Samuel Mendoza-Jonas --- discover/platform-powerpc.c | 15 +++++++++++++++ discover/platform.c | 1 + 2 files changed, 16 insertions(+) diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c index df8c7d6..ba7c470 100644 --- a/discover/platform-powerpc.c +++ b/discover/platform-powerpc.c @@ -53,6 +53,7 @@ struct platform_powerpc { static const char *known_params[] = { "auto-boot?", "petitboot,network", + "petitboot,network_type", "petitboot,timeout", "petitboot,bootdevs", "petitboot,language", @@ -387,6 +388,16 @@ static void populate_network_config(struct platform_powerpc *platform, const char *cval; int i; + cval = get_param(platform, "petitboot,network_type"); + if (!cval || !strlen(cval) || strncmp(cval, "ipv4", strlen("ipv4")) == 0) + config->network.addr_type = ADDR_IPV4; + else if (strncmp(cval, "ipv6", strlen("ipv6")) == 0) + config->network.addr_type = ADDR_IPV6; + else { + pb_debug("malformed petitboot,network_type param"); + config->network.addr_type = ADDR_IPV4; + } + cval = get_param(platform, "petitboot,network"); if (!cval || !strlen(cval)) return; @@ -630,6 +641,10 @@ static void update_network_config(struct platform_powerpc *platform, config->network.interfaces[0]->override) return; + update_string_config(platform, "petitboot,network_type", + config->network.addr_type == ADDR_IPV6 ? + "ipv6" : "ipv4"); + val = talloc_strdup(platform, ""); for (i = 0; i < config->network.n_interfaces; i++) { diff --git a/discover/platform.c b/discover/platform.c index cc6306f..30a6ffd 100644 --- a/discover/platform.c +++ b/discover/platform.c @@ -126,6 +126,7 @@ void config_set_defaults(struct config *config) config->network.n_interfaces = 0; config->network.dns_servers = NULL; config->network.n_dns_servers = 0; + config->network.addr_type = ADDR_IPV4; config->http_proxy = NULL; config->https_proxy = NULL; config->safe_mode = false;