~ruther/guix-local: activation: Silence warning from 'useradd'.

f3b692acdd6da6c6a660f3d1b8de79e7f6ca25c7 — Ludovic Courtès 12 years ago 7f17ff7

activation: Silence warning from 'useradd'.

* guix/build/activation.scm (add-user): Don't pass '--create-home' when
  HOME already exists.

patch browse .tar.gz

1 files changed, 5 insertions(+), 1 deletions(-)

M guix/build/activation.scm

M guix/build/activation.scm => guix/build/activation.scm +5 -1

@@ 73,7 73,11 @@ properties.  Return #t on success."
                           `("-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)))