guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/07: accounts: Always honor the configured user account shell.


From: guix-commits
Subject: 01/07: accounts: Always honor the configured user account shell.
Date: Fri, 26 Apr 2019 08:19:45 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 504a0fc636ec591e65b4a229a37e522e425d8a0c
Author: Ludovic Court├Ęs <address@hidden>
Date:   Fri Apr 26 10:19:56 2019 +0200

    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 6b44ab6..c43ce85 100644
--- a/gnu/build/accounts.scm
+++ b/gnu/build/accounts.scm
@@ -483,9 +483,12 @@ new UIDs."
                                (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))))
           '()



reply via email to

[Prev in Thread] Current Thread [Next in Thread]