From patchwork Tue Apr 29 04:47:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 42131 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 1908A27BC4B; Tue, 29 Apr 2025 05:48:36 +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=0.0 required=5.0 tests=none autolearn=unavailable version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D21F927BC49 for ; Tue, 29 Apr 2025 05:48:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9ct3-0007SX-9q; Tue, 29 Apr 2025 00:48:05 -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 1u9ct1-0007SN-Bh for guix-patches@gnu.org; Tue, 29 Apr 2025 00:48:03 -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 1u9ct0-0004dG-T1 for guix-patches@gnu.org; Tue, 29 Apr 2025 00:48:03 -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:Date:References:In-Reply-To:From:To:Subject; bh=m5laxA5FpzHCH/wB5XoZ9tgkoO6eMX6d1Cx4Ntp/ovE=; b=P3gJ4aQBvkH/qiMGCRAepfls29djcW/tOzduKZhUJruqYyjZcGGnDCDvqCzIvGDaB0K7Qo22nE0NNpFYKbPJ3YAwWdzs8zmiS+qx6mq2qbWEM8/XQ8lHuPDl8WDa6fJg9AS24drtOH8kcIrd8CCh4eVSTBGUwnkIqTYUUEM1iLBsvI2/6iuHFA0KJuaXYK9iz318V2kMyh4ZP+CJFc7fwW7vdBMKVi0kQfRjr+T7qthf7VGLa+iURlvfemoE2KUFizrFqPUeqX9JocevN53CIJP/jQwf1L3yP7CW9aAekZDwXeDVW8RDn/wxGfj6kOTd9OQkGAWLIpCJ9710BsdzvQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9ct0-0003M4-Ig for guix-patches@gnu.org; Tue, 29 Apr 2025 00:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73494] [PATCH v3 2/3] services: cleanup: Make /var/run a symlink of /run. Resent-From: Z572 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Apr 2025 04:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73494 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: Vagrant Cascadian , Hilton Chain , 73494@debbugs.gnu.org, Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 73494-submit@debbugs.gnu.org id=B73494.174590206112775 (code B ref 73494); Tue, 29 Apr 2025 04:48:02 +0000 Received: (at 73494) by debbugs.gnu.org; 29 Apr 2025 04:47:41 +0000 Received: from localhost ([127.0.0.1]:44390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9cse-0003Jz-UR for submit@debbugs.gnu.org; Tue, 29 Apr 2025 00:47:41 -0400 Received: from mail.z572.online ([88.99.160.180]:49200) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u9csX-0003IO-JJ for 73494@debbugs.gnu.org; Tue, 29 Apr 2025 00:47:38 -0400 Received: from m ( [115.198.129.146]) by mail.z572.online (OpenSMTPD) with ESMTPSA id abcac660 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 29 Apr 2025 04:54:14 +0000 (UTC) From: Z572 In-Reply-To: <87wmb3bvw2.fsf@gmail.com> (Maxim Cournoyer's message of "Tue, 29 Apr 2025 10:26:37 +0900") References: <830b6fd522e9fc0e5c0008560dd9877c44d18d35.1741241800.git.hako@ultrarare.space> <87v7qrdkwz.fsf@gmail.com> <87bjsix4k9.wl-hako@ultrarare.space> <87wmb3bvw2.fsf@gmail.com> User-Agent: mu4e 1.12.9; emacs 30.0.92 Date: Tue, 29 Apr 2025 12:47:24 +0800 Message-ID: <87plgv8tgj.fsf@iscas.ac.cn> 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 Maxim Cournoyer writes: > Hi Hilton, > > Hilton Chain writes: > > [...] > >> As said in [1], I have changed to use bind mount instead, currently >> locally and >> available in [2]. This approach should get rid of symlink issues. > > As mentioned on IRC, I've tried all these, but I'm still left with a > broken 'jami-provisioning' system test. It still needs investigating to > understand what is at cause. I've tried many things such as having our > dbus use /run instead of /var/run (via a graft -- I hope this was in > effect in the system tests, it looks like it should), but the problem > persisted. mkdir-p/perms does not accept symlinks[1], adjust mkdir-p/perms to ``` (mkdir-p "/var/run/jami") (chown "/var/run/jami" (passwd:uid user) (passwd:gid user)) (chmod "/var/run/jami" #o700) ``` can work and (@@ (gnu tests telephony) make-jami-os) need remove shepherd-system-log-service-type and add syslog-service-type can successed. A rough modification is as follows. [1] https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/build/activation.scm?h=master#n92 and https://issues.guix.gnu.org/47584 From af0588f980006381c3f8e14f6502183a3d39a1b8 Mon Sep 17 00:00:00 2001 Message-ID: From: Zheng Junjie Date: Tue, 29 Apr 2025 12:46:01 +0800 Subject: [PATCH] quickfix Change-Id: I6996b5627d732d1c261ae453da5d0916637b0288 --- gnu/services/telephony.scm | 4 +++- gnu/tests/telephony.scm | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/services/telephony.scm b/gnu/services/telephony.scm index 9926f4107de..a54fab7c4ac 100644 --- a/gnu/services/telephony.scm +++ b/gnu/services/telephony.scm @@ -309,7 +309,9 @@ (define (jami-dbus-session-activation config) #~(begin (use-modules (gnu build activation)) (let ((user (getpwnam "jami"))) - (mkdir-p/perms "/var/run/jami" user #o700) + (mkdir-p "/var/run/jami") + (chown "/var/run/jami" (passwd:uid user) (passwd:gid user)) + (chmod "/var/run/jami" #o700) ;; Customize the D-Bus policy to allow 'root' to access other users' ;; session bus. Also modify the location of the written PID file, ;; from the default '/var/run/dbus/pid' location. This file is only diff --git a/gnu/tests/telephony.scm b/gnu/tests/telephony.scm index f03ea963f7e..219cb421647 100644 --- a/gnu/tests/telephony.scm +++ b/gnu/tests/telephony.scm @@ -30,6 +30,7 @@ (define-module (gnu tests telephony) #:use-module (gnu services telephony) #:use-module (guix gexp) #:use-module (guix modules) + #:use-module (gnu services shepherd) #:export (%test-jami %test-jami-provisioning %test-jami-provisioning-partial)) @@ -116,7 +117,9 @@ (define* (make-jami-os #:key provisioning? partial?) (openssh-configuration (permit-root-login #t) (allow-empty-passwords? #t))) - %base-services)) + (service syslog-service-type) + (modify-services %base-services + (delete shepherd-system-log-service-type)))) (packages (cons* (specification->package "recutils") (specification->package "strace") %base-packages)))) base-commit: f76b9c4fdf88cbab81e3cac27841a6c56e3e32c9 prerequisite-patch-id: fabc087075461a425f06083732136418b4940e6d prerequisite-patch-id: b59e27442300208442b59900e844855b9ed63d96 prerequisite-patch-id: 701e20f8b287553c49ece96290e71dd7ef145b6c -- 2.49.0