From 504a0fc636ec591e65b4a229a37e522e425d8a0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 26 Apr 2019 10:19:56 +0200
Subject: [PATCH] accounts: Always honor the configured user account shell.
Starting from commit 0ae735bcc8ff7fdc89d67b492bdee9091ee19e86, Guix
System would preserve the user shell across reconfigure and reboot.
This was done so as to allow for the use of 'chsh'.
This proved to be a misguided decision. This commit goes back to
considering user shells as config and not "state."
* gnu/build/accounts.scm (allocate-passwd): Do not use shell from
PREVIOUS.
---
gnu/build/accounts.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gnu/build/accounts.scm b/gnu/build/accounts.scm
index 6b44ab610b0..c43ce85b60e 100644
--- a/gnu/build/accounts.scm
+++ b/gnu/build/accounts.scm
@@ -483,9 +483,12 @@ (define (group-id name)
(real-name (if previous
(password-entry-real-name previous)
real-name))
- (shell (if previous
- (password-entry-shell previous)
- shell)))
+
+ ;; Do not reuse the shell of PREVIOUS since (1)
+ ;; that could lead to confusion, and (2) the
+ ;; shell might have been GC'd. See
+ ;; <https://lists.gnu.org/archive/html/guix-devel/2019-04/msg00478.html>.
+ (shell shell))
result)
allocation))))
'()
--
GitLab