From patchwork Wed Aug 23 01:39:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Mendoza-Jonas X-Patchwork-Id: 804721 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 3xcVTV1lYJz9sNd for ; Wed, 23 Aug 2017 11:39:26 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="Bg5H0kLq"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="FPpR46AT"; 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 3xcVTT6jlCzDqkd for ; Wed, 23 Aug 2017 11:39:25 +1000 (AEST) 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="Bg5H0kLq"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="FPpR46AT"; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xcVTM1XDYzDqTr for ; Wed, 23 Aug 2017 11:39:19 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="Bg5H0kLq"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="FPpR46AT"; dkim-atps=neutral Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 13A5121395; Tue, 22 Aug 2017 21:39:17 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute2.internal (MEProxy); Tue, 22 Aug 2017 21:39:17 -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:x-sasl-enc; s=fm1; bh=zFFWCB WUnGJnDW97oryIv85Ypb48hoxlDXbbkYTJhWM=; b=Bg5H0kLqUFy9AGIpXMW2HS aSngeDQlyHMamzZVWZj7dYmz4IubwVUlzZem7shEdlHCS9Bzz3hvRTMbxd8WvVWj fqK2eS50eJtMW3YBbjGiWmuCmz3KX+OHO9U9GHkEFwvAuGHUolQ5jK9YvgklZdTv KQ8Ko0m2lwPQyekRU1rkqBfzzmC6FsRsJ3HBuH2JfTKBGlK0+fAHWuP+wXwYi4pj NqUOlbyVK1XHSUYoF4oOmzgZiB5rseSBypfPiahbhiRsaGdo+dD1rz3fn1VAhX1R cV/my/g1v8NWnU78l2NIjN7TP7aWDkPbhAmA7gmb8e0OtbAYT7wyvGmfMjZbX43A == 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:x-sasl-enc; s=fm1; bh=zFFWCB WUnGJnDW97oryIv85Ypb48hoxlDXbbkYTJhWM=; b=FPpR46ATmZm9kEenDWp9Dw 0/33KF0nuSCWMqE2zJ59v5WrHzwtZ5x6X3ScP9y+Cp2crjVjg+wBFIBhTlGVqtY6 36lqEbvBIvvwL57slKfsumnvuwgKb04bwRAQL7+I1dVlkDzPkoUDeHQr5nx0CZ+q sVlhEOetNlY87dM+RkBAqR8/PuLVpinyRNtDUTr3B2OSepXh+0b3B2f3X5gNhKFu yd71bZcjsXnDT4JzxhYr5p7qG/1xwh0gJcqszaaW5X+QaDchEmVJwDc90E1pCSBG kgc1AcbQEOCoBr5NKbhTEc9iuQrf5c+ybY1s8fUENw59In6nvMf75jn1z2PltO4w == X-ME-Sender: X-Sasl-enc: gGBXNu65h5WlcbkYByvTuGDut9Pcxgs0lv42PjV+W+T6 1503452356 Received: from v4.ozlabs.ibm.com (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id D74967E41E; Tue, 22 Aug 2017 21:39:15 -0400 (EDT) From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH] discover/device-handler: Disable safe mode warning on reinit Date: Wed, 23 Aug 2017 11:39:11 +1000 Message-Id: <20170823013911.15052-1-sam@mendozajonas.com> X-Mailer: git-send-email 2.14.0 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 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" If a user pressed "Rescan Devices" in safe mode the reinit would complete successfully, but the big warning that safe mode is active would remain. On reinit clear the safe_mode flag properly. This has no functional change aside from clearing the UI warning - the IPMI override remains active until cleared or a successful boot occurs. Signed-off-by: Samuel Mendoza-Jonas --- discover/device-handler.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/discover/device-handler.c b/discover/device-handler.c index ce3fc46..4e1b3ca 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -393,6 +394,7 @@ void device_handler_reinit(struct device_handler *handler) { struct discover_boot_option *opt, *tmp; struct ramdisk_device *ramdisk; + struct config *config; unsigned int i; device_handler_cancel_default(handler); @@ -440,6 +442,14 @@ void device_handler_reinit(struct device_handler *handler) set_env_variables(config_get()); + /* If the safe mode warning was active disable it now */ + if (config_get()->safe_mode) { + config = config_copy(handler, config_get()); + config->safe_mode = false; + config_set(config); + discover_server_notify_config(handler->server, config); + } + device_handler_reinit_sources(handler); }