aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-03-27 11:48:01 +0200
committerLudovic Courtès <ludo@gnu.org>2018-03-27 14:51:44 +0200
commit82b71ac366ef154400653d264b46b7aa3520f393 (patch)
tree5aed06ac05e3a7e8d466662d2d4db974694e8961
parent7ddd418a1d678b5ecaac185bde8576c4ed68adf7 (diff)
downloadguix-82b71ac366ef154400653d264b46b7aa3520f393.tar
guix-82b71ac366ef154400653d264b46b7aa3520f393.tar.gz
activation: Pass '-d HOME' to 'usermod'.
Fixes a bug whereby changes to user home directories in the OS config would never be effective. Reported by Pierre Neidhardt <ambrevar@gmail.com>. * gnu/build/activation.scm (modify-user): Pass '-d HOME'.
-rw-r--r--gnu/build/activation.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm
index 6c0d603ddf..68ecd6bc71 100644
--- a/gnu/build/activation.scm
+++ b/gnu/build/activation.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;;
;;; This file is part of GNU Guix.
@@ -179,7 +179,8 @@ properties. Return #t on success."
`("-G" ,(string-join supplementary-groups ","))
'())
,@(if comment `("-c" ,comment) '())
- ;; Don't use '--move-home', so ignore HOME.
+ ;; Don't use '--move-home'.
+ ,@(if home `("-d" ,home) '())
,@(if shell `("-s" ,shell) '())
,name)))
(zero? (apply system* "usermod" args))))