From unknown Fri Sep 19 16:07:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49804] [PATCH] services: pam-limits: fix limits.conf location Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Aug 2021 03:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49804 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49804@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162778765114104 (code B ref -1); Sun, 01 Aug 2021 03:15:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 Aug 2021 03:14:11 +0000 Received: from localhost ([127.0.0.1]:35314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mA1vW-0003fQ-LO for submit@debbugs.gnu.org; Sat, 31 Jul 2021 23:14:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:54816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mA1vV-0003fJ-7a for submit@debbugs.gnu.org; Sat, 31 Jul 2021 23:14:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mA1vU-0008MU-W8 for guix-patches@gnu.org; Sat, 31 Jul 2021 23:14:09 -0400 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]:40455) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mA1vT-0006WE-5Z for guix-patches@gnu.org; Sat, 31 Jul 2021 23:14:08 -0400 Received: by mail-ed1-x533.google.com with SMTP id d6so11878526edt.7 for ; Sat, 31 Jul 2021 20:14:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=muradm-net.20150623.gappssmtp.com; s=20150623; h=user-agent:from:to:subject:message-id:date:mime-version; bh=lZKQqqCOoyt4bPIkGQhKXrsW7fKFtwJsqks4dpW3r7E=; b=NoJqeb872eUZYS7VaWctb88GufbLXNtrldm+8hyM3p2zHYSM2cuvxFpoS3ydV8g7Ln OaqyygdxrRY6MGv6jv165IrsuEp+6HC4V6BPlBk/GEmMp6NqAtV7UtHendWrlcwIv361 LSYrKDtRGQmSur1ET8Dqrxb9EunEEozNVv/XenLNZqpui5qNdwKuzzRJ34hicjFX9Lvw eMXU3EXJr4CjbyHvf/SzIJWhPfGzBV0CXgK6F6mp7gbgGAvnwQyqE5Cwa0j5KJjWAFpn 34Cko0skv2nLDN4dG/HlHiqrGws0lpxKCMeQwC2gXE29lQOBSEWYM/Vp2csLWpXfFPgr P/gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:user-agent:from:to:subject:message-id:date :mime-version; bh=lZKQqqCOoyt4bPIkGQhKXrsW7fKFtwJsqks4dpW3r7E=; b=B0AUs9Bn3uhfkZMx1YJV1LidU0zYyOQnJTi/L0Tk01LRt/ZIb6gnaQottuKuUKF0cn Mu18XlZvFqM/IaiayvFZtTCno2M2gJAPviJvaLVr9MWcTGmW5pg/awqsxZIHHQq4KqH0 1hfCxR94GtC1VOTPUxAO+1/9m5hsEaqNFy6I8XN0CYGXAmQdM8ohhr/P1GSU0IIvrHZL aOPHpLceLNf/JJKkYMxbAt4pX0LMSic3GcFecZpb4vyqzzLrFJ7qV8XGoncwVVbVBOMz eC9Xj2DudCqanojKKo8X98R7tjjvzehywsgz/HGAcVaOba/JJvHrk1m0sJh8rbdSxMnp /16w== X-Gm-Message-State: AOAM533u8fBvduoIAZpRVoiUNlOcxTtqDHW2re5HqD5dV6V5kMxZwFwM slFiZEvKOP3I8BYYV00W2ZVKJTlrQq+7J0sqByY= X-Google-Smtp-Source: ABdhPJyEKB/Q+8Se3S1nIkGuepgGbXMh4J/4NdWsHYDh93+bOzD207FVZdZU33zOlGnSyN4MC81+xQ== X-Received: by 2002:a05:6402:185:: with SMTP id r5mr11778433edv.349.1627787644140; Sat, 31 Jul 2021 20:14:04 -0700 (PDT) Received: from nomad-lp1 ([31.142.116.101]) by smtp.gmail.com with ESMTPSA id qo26sm2454554ejb.65.2021.07.31.20.14.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Jul 2021 20:14:03 -0700 (PDT) User-agent: mu4e 1.4.15; emacs 28.0.50 From: muradm Message-ID: <874kc9n9fr.fsf@muradm.net> Date: Sun, 01 Aug 2021 06:14:00 +0300 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: none client-ip=2a00:1450:4864:20::533; envelope-from=mail@muradm.net; helo=mail-ed1-x533.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; format=flowed * gnu/services/base.scm: fix limits.conf location This fixes #49771 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=guix-49771.patch diff --git a/gnu/services/base.scm b/gnu/services/base.scm index ab3e441a7b..53c3abfa48 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1383,14 +1383,8 @@ information on the configuration file syntax." (let ((security-limits ;; Create /etc/security containing the provided "limits.conf" file. (lambda (limits-file) - `(("security" - ,(computed-file - "security" - #~(begin - (mkdir #$output) - (stat #$limits-file) - (symlink #$limits-file - (string-append #$output "/limits.conf")))))))) + `(("security/limits.conf" + ,limits-file)))) (pam-extension (lambda (pam) (let ((pam-limits (pam-entry --=-=-=-- From unknown Fri Sep 19 16:07:36 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: muradm Subject: bug#49804: closed (Re: [bug#49804] [PATCH] services: pam-limits: fix limits.conf location) Message-ID: References: <20210807173547.12257ae6@tachikoma.lepiller.eu> <874kc9n9fr.fsf@muradm.net> X-Gnu-PR-Message: they-closed 49804 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 49804@debbugs.gnu.org Date: Sat, 07 Aug 2021 15:37:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1628350622-1719-1" This is a multi-part message in MIME format... ------------=_1628350622-1719-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #49804: [PATCH] services: pam-limits: fix limits.conf location which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 49804@debbugs.gnu.org. --=20 49804: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D49804 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1628350622-1719-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 49804-done) by debbugs.gnu.org; 7 Aug 2021 15:36:05 +0000 Received: from localhost ([127.0.0.1]:53018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCOMn-0000Pt-9b for submit@debbugs.gnu.org; Sat, 07 Aug 2021 11:36:05 -0400 Received: from lepiller.eu ([89.234.186.109]:54506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCOMh-0000PL-Sw; Sat, 07 Aug 2021 11:36:04 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id cee6f0ea; Sat, 7 Aug 2021 15:35:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=x/jlqWLwFgmn VPJ020EtifmWuzRNPzc6NBvyI6KNK7A=; b=Ftp403IZATI70yxvwSsdJLQvgeOr eUM+5bj1PzovRqRbVxKIF49Pr7Qk87sTLQyLeam+VgYaQ+BTCgGVmg6QhKIUHsoH 13Z+Toe2D/VfOjxZF2MvE7nDFk+7KJs/PsLVBDaEImk4fn7UG7pCliMgCFxB457Y GGmu9TfgLUIwGFr4FB8GVONNUJx+CvR/qU1ut9aOttzm6TwRacPXtOaXjBQN9ZAa UO67VVb/kODMdC4w+sXDWCG8nj3d395hU8wVDykhcCt2e1gwKklX+iOoyWrmNRhD qFnkU5woubANBZ/AOOXz7qmhPTrOPbnI9UJFZtTXhlulE3xWnN+yV2m0Yg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 5abf6187 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Sat, 7 Aug 2021 15:35:57 +0000 (UTC) Date: Sat, 7 Aug 2021 17:35:47 +0200 From: Julien Lepiller To: muradm Subject: Re: [bug#49804] [PATCH] services: pam-limits: fix limits.conf location Message-ID: <20210807173547.12257ae6@tachikoma.lepiller.eu> In-Reply-To: <874kc9n9fr.fsf@muradm.net> References: <874kc9n9fr.fsf@muradm.net> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49804-done Cc: 49804-done@debbugs.gnu.org, 49771-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le Sun, 01 Aug 2021 06:14:00 +0300, muradm a =C3=A9crit : > * gnu/services/base.scm: fix limits.conf location >=20 > This fixes #49771 >=20 Pushed as 29883f113087edaf24570fbd7f1113df907f1099, thank you! ------------=_1628350622-1719-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 1 Aug 2021 03:14:11 +0000 Received: from localhost ([127.0.0.1]:35314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mA1vW-0003fQ-LO for submit@debbugs.gnu.org; Sat, 31 Jul 2021 23:14:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:54816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mA1vV-0003fJ-7a for submit@debbugs.gnu.org; Sat, 31 Jul 2021 23:14:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mA1vU-0008MU-W8 for guix-patches@gnu.org; Sat, 31 Jul 2021 23:14:09 -0400 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]:40455) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mA1vT-0006WE-5Z for guix-patches@gnu.org; Sat, 31 Jul 2021 23:14:08 -0400 Received: by mail-ed1-x533.google.com with SMTP id d6so11878526edt.7 for ; Sat, 31 Jul 2021 20:14:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=muradm-net.20150623.gappssmtp.com; s=20150623; h=user-agent:from:to:subject:message-id:date:mime-version; bh=lZKQqqCOoyt4bPIkGQhKXrsW7fKFtwJsqks4dpW3r7E=; b=NoJqeb872eUZYS7VaWctb88GufbLXNtrldm+8hyM3p2zHYSM2cuvxFpoS3ydV8g7Ln OaqyygdxrRY6MGv6jv165IrsuEp+6HC4V6BPlBk/GEmMp6NqAtV7UtHendWrlcwIv361 LSYrKDtRGQmSur1ET8Dqrxb9EunEEozNVv/XenLNZqpui5qNdwKuzzRJ34hicjFX9Lvw eMXU3EXJr4CjbyHvf/SzIJWhPfGzBV0CXgK6F6mp7gbgGAvnwQyqE5Cwa0j5KJjWAFpn 34Cko0skv2nLDN4dG/HlHiqrGws0lpxKCMeQwC2gXE29lQOBSEWYM/Vp2csLWpXfFPgr P/gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:user-agent:from:to:subject:message-id:date :mime-version; bh=lZKQqqCOoyt4bPIkGQhKXrsW7fKFtwJsqks4dpW3r7E=; b=B0AUs9Bn3uhfkZMx1YJV1LidU0zYyOQnJTi/L0Tk01LRt/ZIb6gnaQottuKuUKF0cn Mu18XlZvFqM/IaiayvFZtTCno2M2gJAPviJvaLVr9MWcTGmW5pg/awqsxZIHHQq4KqH0 1hfCxR94GtC1VOTPUxAO+1/9m5hsEaqNFy6I8XN0CYGXAmQdM8ohhr/P1GSU0IIvrHZL aOPHpLceLNf/JJKkYMxbAt4pX0LMSic3GcFecZpb4vyqzzLrFJ7qV8XGoncwVVbVBOMz eC9Xj2DudCqanojKKo8X98R7tjjvzehywsgz/HGAcVaOba/JJvHrk1m0sJh8rbdSxMnp /16w== X-Gm-Message-State: AOAM533u8fBvduoIAZpRVoiUNlOcxTtqDHW2re5HqD5dV6V5kMxZwFwM slFiZEvKOP3I8BYYV00W2ZVKJTlrQq+7J0sqByY= X-Google-Smtp-Source: ABdhPJyEKB/Q+8Se3S1nIkGuepgGbXMh4J/4NdWsHYDh93+bOzD207FVZdZU33zOlGnSyN4MC81+xQ== X-Received: by 2002:a05:6402:185:: with SMTP id r5mr11778433edv.349.1627787644140; Sat, 31 Jul 2021 20:14:04 -0700 (PDT) Received: from nomad-lp1 ([31.142.116.101]) by smtp.gmail.com with ESMTPSA id qo26sm2454554ejb.65.2021.07.31.20.14.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Jul 2021 20:14:03 -0700 (PDT) User-agent: mu4e 1.4.15; emacs 28.0.50 From: muradm To: guix-patches@gnu.org Subject: [PATCH] services: pam-limits: fix limits.conf location Message-ID: <874kc9n9fr.fsf@muradm.net> Date: Sun, 01 Aug 2021 06:14:00 +0300 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: none client-ip=2a00:1450:4864:20::533; envelope-from=mail@muradm.net; helo=mail-ed1-x533.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; format=flowed * gnu/services/base.scm: fix limits.conf location This fixes #49771 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=guix-49771.patch diff --git a/gnu/services/base.scm b/gnu/services/base.scm index ab3e441a7b..53c3abfa48 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1383,14 +1383,8 @@ information on the configuration file syntax." (let ((security-limits ;; Create /etc/security containing the provided "limits.conf" file. (lambda (limits-file) - `(("security" - ,(computed-file - "security" - #~(begin - (mkdir #$output) - (stat #$limits-file) - (symlink #$limits-file - (string-append #$output "/limits.conf")))))))) + `(("security/limits.conf" + ,limits-file)))) (pam-extension (lambda (pam) (let ((pam-limits (pam-entry --=-=-=-- ------------=_1628350622-1719-1--