From patchwork Sat Feb 12 14:38:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 37215 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BFC4427BBEA; Sat, 12 Feb 2022 14:39:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8837F27BBE9 for ; Sat, 12 Feb 2022 14:39:20 +0000 (GMT) Received: from localhost ([::1]:43140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nItYV-0001Ue-KR for patchwork@mira.cbaines.net; Sat, 12 Feb 2022 09:39:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nItYG-0001UU-6k for guix-patches@gnu.org; Sat, 12 Feb 2022 09:39:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39922) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nItYE-0006vt-OA for guix-patches@gnu.org; Sat, 12 Feb 2022 09:39:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nItYE-0002PQ-D8 for guix-patches@gnu.org; Sat, 12 Feb 2022 09:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53959] [PATCH] installer: Continue even if Connman cannot phone home. Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Feb 2022 14:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53959 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53959@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16446767349244 (code B ref -1); Sat, 12 Feb 2022 14:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Feb 2022 14:38:54 +0000 Received: from localhost ([127.0.0.1]:33819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nItY6-0002P1-BR for submit@debbugs.gnu.org; Sat, 12 Feb 2022 09:38:54 -0500 Received: from lists.gnu.org ([209.51.188.17]:50410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nItY4-0002Ou-HK for submit@debbugs.gnu.org; Sat, 12 Feb 2022 09:38:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nItY3-0001U9-V4 for guix-patches@gnu.org; Sat, 12 Feb 2022 09:38:52 -0500 Received: from pelzflorian.de ([5.45.111.108]:45792 helo=mail.pelzflorian.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nItY1-0006uI-IX for guix-patches@gnu.org; Sat, 12 Feb 2022 09:38:51 -0500 Received: from pelzflorian.localdomain (unknown [5.45.111.108]) by mail.pelzflorian.de (Postfix) with ESMTPSA id 5156F360632 for ; Sat, 12 Feb 2022 15:38:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=pelzflorian.de; s=mail; t=1644676726; bh=77ms4Nq9Rj+hWYtX1gW8KT3L20yeGLcib80YDsYglRg=; h=Date:From:To:Subject; b=DG5zvpQk8QZk5BZbgW10evqCt55JPkoF1mHxhwji8nVIsk1nsb00lMRTaDk3IiT6s YsGzkzH3Mtxe37Pn3U1BVkyO926Ij/Zwf/OPCVeWYE7MVpi3axmU6eLCrpG6idM8s+ 1j8wZXw2XbbAQ5PEqB5XYmtJBsx2YXm6vkeE5sXE= Date: Sat, 12 Feb 2022 15:38:32 +0100 From: Florian Pelz Message-ID: <20220212143832.emgl7r3mdqfljgpe@pelzflorian.localdomain> MIME-Version: 1.0 Content-Disposition: inline Received-SPF: pass client-ip=5.45.111.108; envelope-from=pelzflorian@pelzflorian.de; helo=mail.pelzflorian.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Connman's online check is unreliable for me. * gnu/installer/connman.scm (connman-online?): Accept if connman state is ready instead of online. --- gnu/installer/connman.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 5996aab354831d942b10253bc70217a4f2e6a247 diff --git a/gnu/installer/connman.scm b/gnu/installer/connman.scm index 2f33b58453..6095d99947 100644 --- a/gnu/installer/connman.scm +++ b/gnu/installer/connman.scm @@ -287,7 +287,7 @@ (define (connman-disconnect service) (define (connman-online?) (let ((state (connman-state))) - (eq? state 'online))) + (member state '(ready online)))) (define (connman-connect-with-auth service password-proc) "Connect to the given SERVICE with the password returned by calling