From patchwork Sun Apr 20 15:54:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 41825 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 DD0FA27BC4B; Sun, 20 Apr 2025 16:56:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 A8C7F27BC49 for ; Sun, 20 Apr 2025 16:56:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u6X1a-0007Fk-Bv; Sun, 20 Apr 2025 11:56:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u6X1Z-0007FN-0I for guix-patches@gnu.org; Sun, 20 Apr 2025 11:56:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u6X1Y-0007Y2-LE for guix-patches@gnu.org; Sun, 20 Apr 2025 11:56:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=RjGU9LE5PE+HuPWrInangAk8IlTp4S9ARMELpRo5I4I=; b=lVTXQ23yfdHKTV5k8YkexU8Xos1x3WRW/edsBBl6q2AuZC9ro47UcWGUmM2MUU7udqc9CLETCjJxq1qo5us1D1/9afrX8d77MvgSEyfzp2fBARUfjzzbaU+VzFXg1Qemgfn1TuzR30jxmZP1PHtkZsjnfj6NkdT89v/VuyjmhxtaOcIIjx7J4OkCnnZJTO57QV743TPk7Ud0oEjCZWWY1LmDtktA4hmy8BjgBZPJbozE+fXoaMDRiYQtChZrYSUQdXRrDfE+5mKYsuaPG2cbtV3c3/CnpIRitQVdB+J3UJ96SNloBQN6Q1wYSdtY2h/REgibD3htsQEnLW2RgPUHmA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u6X1Y-00024Y-Ef for guix-patches@gnu.org; Sun, 20 Apr 2025 11:56:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77943] [PATCH 1/2] services: shepherd: Provide the right #:kernel-log-file on the Hurd. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Apr 2025 15:56:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77943 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77943@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Yelninei Received: via spool by 77943-submit@debbugs.gnu.org id=B77943.17451645107225 (code B ref 77943); Sun, 20 Apr 2025 15:56:04 +0000 Received: (at 77943) by debbugs.gnu.org; 20 Apr 2025 15:55:10 +0000 Received: from localhost ([127.0.0.1]:51186 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u6X0e-0001rx-CP for submit@debbugs.gnu.org; Sun, 20 Apr 2025 11:55:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35978) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u6X0Z-0001qF-VE for 77943@debbugs.gnu.org; Sun, 20 Apr 2025 11:55:05 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u6X0U-0007KG-Br; Sun, 20 Apr 2025 11:54:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=RjGU9LE5PE+HuPWrInangAk8IlTp4S9ARMELpRo5I4I=; b=N4SOMDe7Xi74a5bLMhFe uHiW7+4V4lm9hLM77yLT53gD0LyMOIsq5Fy15fd1/lu88fQMpeeNOS2nfhEX3NMea1iG+eyWeVnsY aOCaKvKS5apfY5OiG9YMDDZvAegjMwlE2JQfAAqClCWWr5FCeMEpO1wHE0MTJ6eqfthiibpQBE9dH Evns3HjG+0r6aORKzCIEwLTAa+aFs6S6uJ4UCqjU8NRccAD7FE9ulEqjqFuVWwQH/0Pdw0mC/n/5T NpUfzu9btXlwfVZg32cLWyG3zhE+sYo6oLXI1C4c3Hq+1TA6p/n7059vFknyd0byCb3Kq67mCZxlM GF0L/u+FPBParw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 20 Apr 2025 17:54:46 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/shepherd.scm (shepherd-system-log-service-type): Pass #:kernel-log-file. Reported-by: Yelninei Change-Id: I6f7a4b4e8e69a116069886e3879400d600645b30 --- gnu/services/shepherd.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index c8e01c9d83..156a36c2da 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -781,6 +781,15 @@ (define shepherd-system-log-service-type (#f #~()) (value #~(#:message-destination #$value))) + ;; The Shepherd <= 1.0.4 chooses /proc/kmsg + ;; unconditionally. Fix that. + #:kernel-log-file + (cond ((string-contains %host-type "linux") ;Linux + "/proc/kmsg") + ((string-suffix? "-gnu" %host-type) ;GNU/Hurd + "/dev/klog") + (else #f)) + #:date-format #$date-format #:history-size #$history-size #:max-silent-time #$max-silent-time))))) From patchwork Sun Apr 20 15:54:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 41824 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 34BB027BC4A; Sun, 20 Apr 2025 16:56:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 CFA6B27BC49 for ; Sun, 20 Apr 2025 16:56:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u6X1b-0007G5-Uf; Sun, 20 Apr 2025 11:56:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u6X1a-0007Ff-66 for guix-patches@gnu.org; Sun, 20 Apr 2025 11:56:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u6X1Z-0007Y8-Rq; Sun, 20 Apr 2025 11:56:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=D95yKshupXN3Emf8+2y2AZ9iFwfYJnql173TzXddpFc=; b=YKNo9inZju7aSWO27hV5rUhJPw/tvkCB4vOfehemwniVt0t2tSlqnA7mAS1WxVyVB8eW1G+gsWvw2e+29G6NCiPpebQLsXf84dQ3HW0nFC5c4Y42ceOTS73NdxKlx5FMmdeK2bfvCfRKUH7pmslHW0ov5E5VYDGjHGiyT080mrNB7YA1Qb48lNCzh6OKdwLZFQ653ya/qOtZwvDzH16wTUB1TFWd0N1sZ4GbkU0CpD6pmGC1NiJ+NqWnbyXngDlvVi0/Myr7MaF9mBUxxt8YnE51YmmoNbVKMMoCivcpkqWqHpZ5oYTJsFiDYLI2Pv+HmqwXQIKEHCkvxO3QB+c6Tg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u6X1Z-00024k-Ln; Sun, 20 Apr 2025 11:56:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77943] [PATCH 2/2] system: hurd: Switch to the =?utf-8?b?U2hl?= =?utf-8?b?cGhlcmTigJlz?= system log. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: janneke@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 20 Apr 2025 15:56:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77943 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77943@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Janneke Nieuwenhuizen X-Debbugs-Original-Xcc: Janneke Nieuwenhuizen Received: via spool by 77943-submit@debbugs.gnu.org id=B77943.17451645377717 (code B ref 77943); Sun, 20 Apr 2025 15:56:05 +0000 Received: (at 77943) by debbugs.gnu.org; 20 Apr 2025 15:55:37 +0000 Received: from localhost ([127.0.0.1]:51191 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u6X15-0001zj-EM for submit@debbugs.gnu.org; Sun, 20 Apr 2025 11:55:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35982) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u6X0a-0001qM-Mb for 77943@debbugs.gnu.org; Sun, 20 Apr 2025 11:55:07 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u6X0V-0007KN-A8; Sun, 20 Apr 2025 11:54:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=D95yKshupXN3Emf8+2y2AZ9iFwfYJnql173TzXddpFc=; b=EsjyItDKu4D7e5MMy8tX iUHXbVmtLu6ZpUjsJ6JVzki75LjSEA6SesSqW7obrmc7Y0IhERvpD4wmIeLX4qRrRrS2lP/0Cc9KD pBvz9gSyt7CKyj5dQH5wnQYgjG7TPdm0UFj//nwzuVpjZieCdrgBIqVFipyXbNwX9BlmzYJHPpm3K 38hirCwMfliDnz++czjwVgSceIMAtxUiOyrm9JI/popnO4dattlBg/opPjYCOtiWKob/gWhlIlOVT n9EoWOxU1lyIYxJaJqAwLGD/nNTXeeP64V9Ip14IHefkogYgH0GcHbQhISQtrsRy1J9ipM13GNKIX or2r5WXDEhZnpA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 20 Apr 2025 17:54:47 +0200 Message-ID: <061859f87aa8adc79b408425fe1f92f8c2118d3f.1745163830.git.ludo@gnu.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This is a followup to 8492a3c8962664db4bd0e7475f63be0ef59db87a. * gnu/system/hurd.scm (%base-services/hurd): Replace ‘syslog-service-type’ by ‘shepherd-system-log-service-type’. Change-Id: I3e12087a04f06210bd10b649b29fcf9949c5aa35 --- gnu/system/hurd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index c9df366f24..96b6a9a290 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020-2024 Ludovic Courtès +;;; Copyright © 2020-2025 Ludovic Courtès ;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. @@ -100,7 +100,7 @@ (define %base-services/hurd `(("/bin/sh" ,(file-append bash "/bin/sh")) ("/usr/bin/env" ,(file-append coreutils "/bin/env")))) - (service syslog-service-type)) + (service shepherd-system-log-service-type)) (map (lambda (n) (service hurd-getty-service-type (hurd-getty-configuration