Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/631981/?format=api
{ "id": 631981, "url": "http://patchwork.ozlabs.org/api/patches/631981/?format=api", "web_url": "http://patchwork.ozlabs.org/project/petitboot/patch/20160608062812.14480-3-sam@mendozajonas.com/", "project": { "id": 53, "url": "http://patchwork.ozlabs.org/api/projects/53/?format=api", "name": "Petitboot development", "link_name": "petitboot", "list_id": "petitboot.lists.ozlabs.org", "list_email": "petitboot@lists.ozlabs.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20160608062812.14480-3-sam@mendozajonas.com>", "list_archive_url": null, "date": "2016-06-08T06:28:08", "name": "[2/6] discover: Add petitboot,tty and track available consoles", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "72d8d2164cfef5c05d6d06ff4743861a3b71707c", "submitter": { "id": 68013, "url": "http://patchwork.ozlabs.org/api/people/68013/?format=api", "name": "Sam Mendoza-Jonas", "email": "sam@mendozajonas.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/petitboot/patch/20160608062812.14480-3-sam@mendozajonas.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/631981/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/631981/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "petitboot@lists.ozlabs.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "petitboot@lists.ozlabs.org" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3rPdmp1WSdz9sCg\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 8 Jun 2016 16:28:42 +1000 (AEST)", "from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3rPdmp058wzDqGc\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 8 Jun 2016 16:28:42 +1000 (AEST)", "from mendozajonas.com (mendozajonas.com [188.166.185.233])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3rPdmX5X2czDq5v\n\tfor <petitboot@lists.ozlabs.org>;\n\tWed, 8 Jun 2016 16:28:28 +1000 (AEST)", "from skellige.ozlabs.ibm.com (unknown [122.99.82.10])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits)) (Client did not present a certificate)\n\t(Authenticated sender: sam@mendozajonas.com)\n\tby mendozajonas.com (Postfix) with ESMTPSA id 71F3B143F73\n\tfor <petitboot@lists.ozlabs.org>;\n\tWed, 8 Jun 2016 14:28:25 +0800 (SGT)" ], "Authentication-Results": [ "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=mendozajonas.com header.i=@mendozajonas.com\n\theader.b=ZSSbnzn+; dkim-atps=neutral", "lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=mendozajonas.com header.i=@mendozajonas.com\n\theader.b=ZSSbnzn+; dkim-atps=neutral", "lists.ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=mendozajonas.com header.i=@mendozajonas.com\n\theader.b=ZSSbnzn+; dkim-atps=neutral" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=mendozajonas.com;\n\ts=mail; t=1465367305;\n\tbh=5kHRIxdzrpf8DEsz3rpqmRh1nooS50vQHrwizRccfIU=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=ZSSbnzn+/+qxxzbX7h99Irgz5bCoM6zCqZZeFAYGvHp624kHyGOJTVNLBDg9AzG6c\n\tOwGGobk/l4yvPVWFfL3kxny4tcbboF8ppAj8t4R6FbqvvaTuU5VGeTRvZBkRyNDqEL\n\t4b0AugvUhWxuHtzcWkyI9tzg3hHWj2XpC+dpznWo=", "From": "Samuel Mendoza-Jonas <sam@mendozajonas.com>", "To": "petitboot@lists.ozlabs.org", "Subject": "[PATCH 2/6] discover: Add petitboot,\n\ttty and track available consoles", "Date": "Wed, 8 Jun 2016 16:28:08 +1000", "Message-Id": "<20160608062812.14480-3-sam@mendozajonas.com>", "X-Mailer": "git-send-email 2.8.3", "In-Reply-To": "<20160608062812.14480-1-sam@mendozajonas.com>", "References": "<20160608062812.14480-1-sam@mendozajonas.com>", "X-BeenThere": "petitboot@lists.ozlabs.org", "X-Mailman-Version": "2.1.22", "Precedence": "list", "List-Id": "Petitboot bootloader development <petitboot.lists.ozlabs.org>", "List-Unsubscribe": "<https://lists.ozlabs.org/options/petitboot>,\n\t<mailto:petitboot-request@lists.ozlabs.org?subject=unsubscribe>", "List-Archive": "<http://lists.ozlabs.org/pipermail/petitboot/>", "List-Post": "<mailto:petitboot@lists.ozlabs.org>", "List-Help": "<mailto:petitboot-request@lists.ozlabs.org?subject=help>", "List-Subscribe": "<https://lists.ozlabs.org/listinfo/petitboot>,\n\t<mailto:petitboot-request@lists.ozlabs.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org", "Sender": "\"Petitboot\"\n\t<petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>" }, "content": "Add the NVRAM parameter petitboot,tty which sets the default console to\nuse when booting a kernel.\nIn load_config() construct a list of available consoles depending on the\ncurrent platform. A future patch depending on firmware changes will\nallow this list to be constructed dynamically.\n\nSigned-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>\n---\n discover/platform-powerpc.c | 43 +++++++++++++++++++++++++++++++++++++++++++\n discover/platform.c | 10 ++++++++++\n 2 files changed, 53 insertions(+)", "diff": "diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c\nindex 1961304..3956a7e 100644\n--- a/discover/platform-powerpc.c\n+++ b/discover/platform-powerpc.c\n@@ -59,6 +59,7 @@ static const char *known_params[] = {\n \t\"petitboot,debug?\",\n \t\"petitboot,write?\",\n \t\"petitboot,snapshots?\",\n+\t\"petitboot,tty\",\n \tNULL,\n };\n \n@@ -565,6 +566,10 @@ static void populate_config(struct platform_powerpc *platform,\n \tval = get_param(platform, \"petitboot,snapshots?\");\n \tif (val)\n \t\tconfig->disable_snapshots = !strcmp(val, \"false\");\n+\n+\tval = get_param(platform, \"petitboot,tty\");\n+\tif (val)\n+\t\tconfig->boot_tty = talloc_strdup(config, val);\n }\n \n static char *iface_config_str(void *ctx, struct interface_config *config)\n@@ -732,6 +737,9 @@ static int update_config(struct platform_powerpc *platform,\n \t\tval = config->allow_writes ? \"true\" : \"false\";\n \tupdate_string_config(platform, \"petitboot,write?\", val);\n \n+\tval = config->boot_tty ?: \"\";\n+\tupdate_string_config(platform, \"petitboot,tty\", val);\n+\n \tupdate_network_config(platform, config);\n \n \tupdate_bootdev_config(platform, config);\n@@ -1217,6 +1225,39 @@ static void get_ipmi_network_override(struct platform_powerpc *platform,\n \t}\n }\n \n+static void get_active_consoles(struct config *config)\n+{\n+\tstruct stat sbuf;\n+\tchar *fsp_prop = NULL;\n+\n+\tconfig->n_tty = 2;\n+\tconfig->tty_list = talloc_array(config, char *, config->n_tty);\n+\tif (!config->tty_list)\n+\t\tgoto err;\n+\n+\tconfig->tty_list[0] = talloc_asprintf(config->tty_list,\n+\t\t\t\t\t\"IPMI: /dev/hvc0\");\n+\tconfig->tty_list[1] = talloc_asprintf(config->tty_list,\n+\t\t\t\t\t\"VGA: /dev/tty1\");\n+\n+\tfsp_prop = talloc_asprintf(config, \"%sfsps\", devtree_dir);\n+\tif (stat(fsp_prop, &sbuf) == 0) {\n+\t\t/* FSP based machines also have a separate serial console */\n+\t\tconfig->tty_list = talloc_realloc(config, config->tty_list,\n+\t\t\t\t\t\tchar *,\tconfig->n_tty + 1);\n+\t\tif (!config->tty_list)\n+\t\t\tgoto err;\n+\t\tconfig->tty_list[config->n_tty++] = talloc_asprintf(\n+\t\t\t\t\t\tconfig->tty_list,\n+\t\t\t\t\t\t\"Serial: /dev/hvc1\");\n+\t}\n+\n+\treturn;\n+err:\n+\tconfig->n_tty = 0;\n+\tpb_log(\"Failed to allocate memory for tty_list\\n\");\n+}\n+\n static int load_config(struct platform *p, struct config *config)\n {\n \tstruct platform_powerpc *platform = to_platform_powerpc(p);\n@@ -1241,6 +1282,8 @@ static int load_config(struct platform *p, struct config *config)\n \tif (platform->ipmi)\n \t\tget_ipmi_network_override(platform, config);\n \n+\tget_active_consoles(config);\n+\n \treturn 0;\n }\n \ndiff --git a/discover/platform.c b/discover/platform.c\nindex fc0930d..254da97 100644\n--- a/discover/platform.c\n+++ b/discover/platform.c\n@@ -79,6 +79,12 @@ static void dump_config(struct config *config)\n \tpb_log(\" IPMI boot device 0x%02x%s\\n\", config->ipmi_bootdev,\n \t\t\tconfig->ipmi_bootdev_persistent ? \" (persistent)\" : \"\");\n \n+\tpb_log(\" Modifications allowed to disks: %s\\n\",\n+\t\t\tconfig->allow_writes ? \"yes\" : \"no\");\n+\n+\tpb_log(\" Default UI to boot on: %s\\n\",\n+\t\tconfig->boot_tty ?: \"none set\");\n+\n \n \tpb_log(\" language: %s\\n\", config->lang ?: \"\");\n }\n@@ -117,6 +123,10 @@ void config_set_defaults(struct config *config)\n \tconfig->allow_writes = true;\n \tconfig->disable_snapshots = false;\n \n+\tconfig->n_tty = 0;\n+\tconfig->tty_list = NULL;\n+\tconfig->boot_tty = NULL;\n+\n \tconfig->n_autoboot_opts = 2;\n \tconfig->autoboot_opts = talloc_array(config, struct autoboot_option,\n \t\t\t\t\t\tconfig->n_autoboot_opts);\n", "prefixes": [ "2/6" ] }