guix-commits
[Top][All Lists]
Advanced

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

01/08: Revert "installer: user: Remove useless filtering."


From: guix-commits
Subject: 01/08: Revert "installer: user: Remove useless filtering."
Date: Fri, 20 May 2022 18:18:06 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 48c748226e2a94d2dec9bfdf84601455f00d6f5e
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri May 20 20:41:02 2022 +0200

    Revert "installer: user: Remove useless filtering."
    
    This reverts commit c2125e59d0774cda3e559adeb056459a5f23586b.
    
    Fixes <https://issues.guix.gnu.org/55361>.
---
 gnu/installer/user.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/installer/user.scm b/gnu/installer/user.scm
index b042c9790d..c894a91dc8 100644
--- a/gnu/installer/user.scm
+++ b/gnu/installer/user.scm
@@ -69,5 +69,10 @@
       (supplementary-groups '("wheel" "netdev"
                               "audio" "video"))))
 
-  `((users (cons* ,@(map user->sexp users)
-                  %base-user-accounts))))
+  `((users (cons*
+            ,@(filter-map (lambda (user)
+                            ;; Do not emit a 'user-account' form for "root".
+                            (and (not (string=? (user-name user) "root"))
+                                 (user->sexp user)))
+                          users)
+            %base-user-accounts))))



reply via email to

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