From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 7GKfBIRGAGBtZgAA0tVLHw (envelope-from ) for ; Thu, 14 Jan 2021 13:26:28 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id SH2QO4NGAGCQbgAAB5/wlQ (envelope-from ) for ; Thu, 14 Jan 2021 13:26:27 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4C50D9401C0 for ; Thu, 14 Jan 2021 13:26:27 +0000 (UTC) Received: from localhost ([::1]:36298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l02dt-0007Ju-CE for larch@yhetil.org; Thu, 14 Jan 2021 08:26:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l02M6-0006Ku-U8 for bug-guix@gnu.org; Thu, 14 Jan 2021 08:08:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54179) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l02M6-0001da-Kj for bug-guix@gnu.org; Thu, 14 Jan 2021 08:08:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l02M6-0002sS-DP for bug-guix@gnu.org; Thu, 14 Jan 2021 08:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#45836: [PATCH] services: Let cups-service-type reuse base lp group. References: In-Reply-To: Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 14 Jan 2021 13:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45836 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 45836@debbugs.gnu.org Received: via spool by 45836-submit@debbugs.gnu.org id=B45836.161062963411004 (code B ref 45836); Thu, 14 Jan 2021 13:08:02 +0000 Received: (at 45836) by debbugs.gnu.org; 14 Jan 2021 13:07:14 +0000 Received: from localhost ([127.0.0.1]:37492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l02LJ-0002rQ-Tp for submit@debbugs.gnu.org; Thu, 14 Jan 2021 08:07:14 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:21387) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l02LH-0002rH-Aj for 45836@debbugs.gnu.org; Thu, 14 Jan 2021 08:07:12 -0500 Received: from localhost.localdomain (217-149-169-137.nat.highway.telekom.at [217.149.169.137]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DGl2g57pLz1LWp5; Thu, 14 Jan 2021 14:07:07 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4DGl2g57pLz1LWp5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1610629627; bh=T9kqP+lhAj4CLeCja1rIMPK7c83pD0Au6IS9hm16tF4=; h=From:To:Cc:Subject:Date:From; b=Be2HnRkAKIbFOwE96mYjwxdl9dz9w7nyLA3c976UnMvLYy8wFDQENi/e/C46QGNpe ZBNBCQ4joMjnVq0m+vmT1+NgG/uJzosiQtt2HmHUYXRDtMumPh+LgBy8N7cf1HEdn4 SJkZzyVDPyUXFa7ogrtY+v/K/H94UGX62spLIcEM= From: Leo Prikler Date: Thu, 14 Jan 2021 14:06:11 +0100 Message-Id: <20210114130610.31936-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 3.74 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=tugraz.at header.s=mailrelay header.b=Be2HnRkA; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 4C50D9401C0 X-Spam-Score: 3.74 X-Migadu-Scanner: scn0.migadu.com X-TUID: q5sDTp6WKhit * gnu/services/cups.scm (%cups-accounts): Try to use the lp group defined in %base-groups. * gnu/system/shadow.scm (account-activation): Delete duplicate (eq?) users and groups before transforming them to specs and asserting, that names are unique. --- gnu/services/cups.scm | 10 ++++++++-- gnu/system/shadow.scm | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index f10615e59e..17ed04e58b 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -32,7 +32,7 @@ #:use-module (guix records) #:use-module (guix gexp) #:use-module (ice-9 match) - #:use-module ((srfi srfi-1) #:select (append-map)) + #:use-module ((srfi srfi-1) #:select (append-map find)) #:export (cups-service-type cups-configuration opaque-cups-configuration @@ -50,7 +50,13 @@ ;;; Code: (define %cups-accounts - (list (user-group (name "lp") (system? #t)) + (list (or + ;; The "lp" group should already exist; try to reuse it. + (find (lambda (group) + (and (user-group? group) + (string=? (user-group-name group) "lp"))) + %base-groups) + (user-group (name "lp") (system? #t))) (user-group (name "lpadmin") (system? #t)) (user-account (name "lp") diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 0538fb1a24..7c57222716 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -321,13 +321,13 @@ of user '~a' is undeclared") objects. Raise an error if a user account refers to a undefined group." (define accounts - (filter user-account? accounts+groups)) + (delete-duplicates (filter user-account? accounts+groups) eq?)) (define user-specs (map user-account->gexp accounts)) (define groups - (filter user-group? accounts+groups)) + (delete-duplicates (filter user-group? accounts+groups) eq?)) (define group-specs (map user-group->gexp groups)) -- 2.30.0