From f3b692acdd6da6c6a660f3d1b8de79e7f6ca25c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 14 May 2014 19:05:21 +0200
Subject: [PATCH] activation: Silence warning from 'useradd'.
* guix/build/activation.scm (add-user): Don't pass '--create-home' when
HOME already exists.
---
guix/build/activation.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/guix/build/activation.scm b/guix/build/activation.scm
index 895f2bca5bb..267c592b524 100644
--- a/guix/build/activation.scm
+++ b/guix/build/activation.scm
@@ -73,7 +73,11 @@ (define* (add-user name group
`("-G" ,(string-join supplementary-groups ","))
'())
,@(if comment `("-c" ,comment) '())
- ,@(if home `("-d" ,home "--create-home") '())
+ ,@(if home
+ (if (file-exists? home)
+ `("-d" ,home) ; avoid warning from 'useradd'
+ `("-d" ,home "--create-home"))
+ '())
,@(if shell `("-s" ,shell) '())
,@(if password `("-p" ,password) '())
,name)))
--
GitLab