From patchwork Sun Aug 1 03:14:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 31676 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 6FE6C27BC6B; Sun, 1 Aug 2021 04:15:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 235E627BC78 for ; Sun, 1 Aug 2021 04:15:11 +0100 (BST) Received: from localhost ([::1]:39084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mA1wT-0008NT-VJ for patchwork@mira.cbaines.net; Sat, 31 Jul 2021 23:15:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mA1wM-0008NG-Fr for guix-patches@gnu.org; Sat, 31 Jul 2021 23:15:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52003) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mA1wM-0007JY-8E for guix-patches@gnu.org; Sat, 31 Jul 2021 23:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mA1wM-0003gv-5e for guix-patches@gnu.org; Sat, 31 Jul 2021 23:15:02 -0400 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 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-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 * gnu/services/base.scm: fix limits.conf location This fixes #49771 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