From patchwork Mon Mar 4 11:16:41 2019 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: 1284 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 A999F16CF8; Mon, 4 Mar 2019 11:17:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 188EB16CF5 for ; Mon, 4 Mar 2019 11:17:10 +0000 (GMT) Received: from localhost ([127.0.0.1]:52080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0lan-0002HP-NH for patchwork@mira.cbaines.net; Mon, 04 Mar 2019 06:17:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36236) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0lai-0002Gq-5E for guix-patches@gnu.org; Mon, 04 Mar 2019 06:17:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0lag-0000VR-NB for guix-patches@gnu.org; Mon, 04 Mar 2019 06:17:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45486) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0lag-0000UL-GS for guix-patches@gnu.org; Mon, 04 Mar 2019 06:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h0lag-0006HA-A8 for guix-patches@gnu.org; Mon, 04 Mar 2019 06:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34730] [PATCH 1/4] system: Add (gnu system accounts). References: <20190304111213.8436-1-ludo@gnu.org> In-Reply-To: <20190304111213.8436-1-ludo@gnu.org> Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Mar 2019 11:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34730@debbugs.gnu.org Received: via spool by 34730-submit@debbugs.gnu.org id=B34730.155169821524077 (code B ref 34730); Mon, 04 Mar 2019 11:17:02 +0000 Received: (at 34730) by debbugs.gnu.org; 4 Mar 2019 11:16:55 +0000 Received: from localhost ([127.0.0.1]:59022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h0laY-0006GE-Dy for submit@debbugs.gnu.org; Mon, 04 Mar 2019 06:16:54 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:34604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h0laW-0006Fz-CQ for 34730@debbugs.gnu.org; Mon, 04 Mar 2019 06:16:53 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id C481D9B0B; Mon, 4 Mar 2019 12:16:51 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uqBlCuCrpN-T; Mon, 4 Mar 2019 12:16:50 +0100 (CET) Received: from gnu.org (unknown [IPv6:2001:660:6102:320:e120:2c8f:8909:cdfe]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 025E59B02; Mon, 4 Mar 2019 12:16:49 +0100 (CET) From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 4 Mar 2019 12:16:41 +0100 Message-Id: <20190304111644.8573-1-ludo@gnu.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 The (gnu system accounts) module is meant to be used both on the build- and on the host-side. * gnu/system/shadow.scm : Call 'default-shell'. (, ): Move to... * gnu/system/accounts.scm: ... here. New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add system/accounts.scm. --- gnu/local.mk | 1 + gnu/system/accounts.scm | 81 +++++++++++++++++++++++++++++++++++++++++ gnu/system/shadow.scm | 72 +++++++++++++----------------------- 3 files changed, 107 insertions(+), 47 deletions(-) create mode 100644 gnu/system/accounts.scm diff --git a/gnu/local.mk b/gnu/local.mk index 3d59e27e8f..a8915cf36b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -527,6 +527,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/xorg.scm \ \ %D%/system.scm \ + %D%/system/accounts.scm \ %D%/system/file-systems.scm \ %D%/system/install.scm \ %D%/system/linux-container.scm \ diff --git a/gnu/system/accounts.scm b/gnu/system/accounts.scm new file mode 100644 index 0000000000..36ee62e851 --- /dev/null +++ b/gnu/system/accounts.scm @@ -0,0 +1,81 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu system accounts) + #:use-module (guix records) + #:export (user-account + user-account? + user-account-name + user-account-password + user-account-uid + user-account-group + user-account-supplementary-groups + user-account-comment + user-account-home-directory + user-account-create-home-directory? + user-account-shell + user-account-system? + + user-group + user-group? + user-group-name + user-group-password + user-group-id + user-group-system? + + default-shell)) + + +;;; Commentary: +;;; +;;; Data structures representing user accounts and user groups. This is meant +;;; to be used both on the host side and at run time--e.g., in activation +;;; snippets. +;;; +;;; Code: + +(define default-shell + ;; Default shell for user accounts (a string or string-valued gexp). + (make-parameter "/bin/sh")) + +(define-record-type* + user-account make-user-account + user-account? + (name user-account-name) + (password user-account-password (default #f)) + (uid user-account-uid (default #f)) + (group user-account-group) ; number | string + (supplementary-groups user-account-supplementary-groups + (default '())) ; list of strings + (comment user-account-comment (default "")) + (home-directory user-account-home-directory) + (create-home-directory? user-account-create-home-directory? ;Boolean + (default #t)) + (shell user-account-shell ; gexp + (default (default-shell))) + (system? user-account-system? ; Boolean + (default #f))) + +(define-record-type* + user-group make-user-group + user-group? + (name user-group-name) + (password user-group-password (default #f)) + (id user-group-id (default #f)) + (system? user-group-system? ; Boolean + (default #f))) diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 63f544cec9..a9a4afd414 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016 Alex Griffin ;;; ;;; This file is part of GNU Guix. @@ -24,6 +24,7 @@ #:use-module (guix modules) #:use-module (guix sets) #:use-module (guix ui) + #:use-module (gnu system accounts) #:use-module (gnu services) #:use-module (gnu services shepherd) #:use-module ((gnu system file-systems) @@ -36,27 +37,29 @@ #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) - #:export (user-account - user-account? - user-account-name - user-account-password - user-account-uid - user-account-group - user-account-supplementary-groups - user-account-comment - user-account-home-directory - user-account-create-home-directory? - user-account-shell - user-account-system? - user-group - user-group? - user-group-name - user-group-password - user-group-id - user-group-system? + ;; Re-export these bindings for backward compatibility. + #:re-export (user-account + user-account? + user-account-name + user-account-password + user-account-uid + user-account-group + user-account-supplementary-groups + user-account-comment + user-account-home-directory + user-account-create-home-directory? + user-account-shell + user-account-system? - default-skeletons + user-group + user-group? + user-group-name + user-group-password + user-group-id + user-group-system?) + + #:export (default-skeletons skeleton-directory %base-groups %base-user-accounts @@ -70,33 +73,8 @@ ;;; ;;; Code: -(define-record-type* - user-account make-user-account - user-account? - (name user-account-name) - (password user-account-password (default #f)) - (uid user-account-uid (default #f)) - (group user-account-group) ; number | string - (supplementary-groups user-account-supplementary-groups - (default '())) ; list of strings - (comment user-account-comment (default "")) - (home-directory user-account-home-directory) - (create-home-directory? user-account-create-home-directory? ;Boolean - (default #t)) - (shell user-account-shell ; gexp - (default (file-append bash "/bin/bash"))) - (system? user-account-system? ; Boolean - (default #f))) - -(define-record-type* - user-group make-user-group - user-group? - (name user-group-name) - (password user-group-password (default #f)) - (id user-group-id (default #f)) - (system? user-group-system? ; Boolean - (default #f))) - +;; Change the default shell used by new records. +(default-shell (file-append bash "/bin/bash")) (define %base-groups ;; Default set of groups.