GNU bug report logs - #56758
[PATCH 0/2] Don't try to mkdir XDG_RUNTIME_DIR

Previous Next

Full log

View this message in rfc822 format

From: Ludovic Courtès <ludo <at> gnu.org>
To: Andrew Tropin <andrew <at> trop.in>
Cc: 56758 <at> debbugs.gnu.org
Subject: [bug#56758] [PATCH 0/2] Don't try to mkdir XDG_RUNTIME_DIR
Date: Mon, 01 Aug 2022 12:08:39 +0200

[Message part 1 (text/plain, inline)]

Hi,

Andrew Tropin <andrew <at> trop.in> skribis:

> From d08ed8de3ead1a704a96e0e6673dffb62f859597 Mon Sep 17 00:00:00 2001
> From: Andrew Tropin <andrew <at> trop.in>
> Date: Thu, 21 Jul 2022 15:24:32 +0300
> Subject: [PATCH 1/2] home: xdg: Use closures in activation scripts.
>
> * gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation,
> home-xdg-user-directories-files-service): Use closures in activation scripts.

[...]

>  (define (ensure-xdg-base-dirs-on-activation config)
> -  #~(map (lambda (xdg-base-dir-variable)
> -           ((@@ (guix build utils) mkdir-p)
> -            (getenv
> -             xdg-base-dir-variable)))
> -         '#$(map (lambda (field)
> -                   (format
> -                    #f "XDG_~a"
> -                    (object->snake-case-string
> -                     (configuration-field-name field) 'upper)))
> -                 home-xdg-base-directories-configuration-fields)))
> +  (with-imported-modules '((guix build utils))
> +    #~(map (lambda (xdg-base-dir-variable)
> +             ((@ (guix build utils) mkdir-p)

This change doesn’t hurt but it’s apparently unnecessary.

> +    (with-imported-modules `((guix build utils)
> +                             ,@(source-module-closure
> +                                '((ice-9 string-fun))))

However this one is incorrect is it would lead (ice-9 string-fun) from
the host Guile to be imported into the build environment, thereby making
the result dependent on the version of Guile that is used “outside” (you
may have seen a warning like “importing (ice-9 string-fun) from the
host”.)

> From da332f8272ea3c240fc4e3664051da3b3a4e18c6 Mon Sep 17 00:00:00 2001
> From: Andrew Tropin <andrew <at> trop.in>
> Date: Thu, 21 Jul 2022 17:06:24 +0300
> Subject: [PATCH 2/2] home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation
>  script.
>
> * gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation): Skip mkdir
> XDG_RUNTIME_DIR in activation script.
> ---
>  gnu/home/services/xdg.scm | 19 ++++++++++++-------
>  1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm
> index 5a41dc4994..541f64a379 100644
> --- a/gnu/home/services/xdg.scm
> +++ b/gnu/home/services/xdg.scm
> @@ -109,13 +109,18 @@ (define (ensure-xdg-base-dirs-on-activation config)
>    (with-imported-modules '((guix build utils))
>      #~(map (lambda (xdg-base-dir-variable)
>               ((@ (guix build utils) mkdir-p)
> -              (getenv
> -               xdg-base-dir-variable)))
> -           '#$(map (lambda (field)
> -                     (format
> -                      #f "XDG_~a"
> -                      (object->snake-case-string
> -                       (configuration-field-name field) 'upper)))
> +              (getenv xdg-base-dir-variable)))
> +           '#$(filter-map
> +               (lambda (field)
> +                 (let ((env-var-name
> +                        (format
> +                         #f "XDG_~a"
> +                         (object->snake-case-string
> +                          (configuration-field-name field) 'upper))))
> +                   ;; XDG_RUNTIME_DIR shouldn't be created during activation
> +                   ;; and will be provided by elogind or other service.
> +                   (and (not (string=? "XDG_RUNTIME_DIR" env-var-name))
> +                        env-var-name)))
>                     home-xdg-base-directories-configuration-fields))))
>  
>  (define (last-extension-or-cfg config extensions)

I tweaked that accordingly (patch attached), but that leads to a test
failure in ‘tests/guix-home.sh’ because there’s a warning about
XDG_RUNTIME_DIR not existing that goes to standard output of ‘guix home
container’:

--8<---------------cut here---------------start------------->8---
+ guix home container home.scm -- false
XDG_RUNTIME_DIR doesn't exists, on-first-login script
won't execute anything.  You can check if xdg runtime directory exists,
XDG_RUNTIME_DIR variable is set to appropriate value and manually execute the
script by running '$HOME/.guix-home/on-first-login'++ guix home container home.scm -- echo '$HOME'
guix home: warning: only 4.1 GiB of free space available on /gnu/store
hint: Consider deleting old profile generations and collecting garbage, along
these lines:

     guix gc --delete-generations=1m

+ test 'XDG_RUNTIME_DIR doesn'\''t exists, on-first-login script
won'\''t execute anything.  You can check if xdg runtime directory exists,
XDG_RUNTIME_DIR variable is set to appropriate value and manually execute the
script by running '\''$HOME/.guix-home/on-first-login'\''/home/ludo' = /home/ludo
--8<---------------cut here---------------end--------------->8---

Thoughts?

Ludo’.

[0001-home-xdg-Skip-mkdir-XDG_RUNTIME_DIR-in-activation-sc.patch (text/x-patch, inline)]

From f6ff733aaaea7e5b8277b65430e7dc090dffa9aa Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew <at> trop.in>
Date: Thu, 21 Jul 2022 17:06:24 +0300
Subject: [PATCH] home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation script.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation): Skip mkdir
XDG_RUNTIME_DIR in activation script.

Co-authored-by: Ludovic Courtès <ludo <at> gnu.org>
---
 gnu/home/services/xdg.scm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm
index 71c028c788..0219bc93e0 100644
--- a/gnu/home/services/xdg.scm
+++ b/gnu/home/services/xdg.scm
@@ -109,12 +109,18 @@ (define (ensure-xdg-base-dirs-on-activation config)
            ((@@ (guix build utils) mkdir-p)
             (getenv
              xdg-base-dir-variable)))
-         '#$(map (lambda (field)
-                   (format
-                    #f "XDG_~a"
-                    (object->snake-case-string
-                     (configuration-field-name field) 'upper)))
-                 home-xdg-base-directories-configuration-fields)))
+         '#$(filter-map
+             (lambda (field)
+               (let ((variable
+                      (string-append
+                       "XDG_"
+                       (object->snake-case-string
+                        (configuration-field-name field) 'upper))))
+                 ;; XDG_RUNTIME_DIR shouldn't be created during activation
+                 ;; and will be provided by elogind or other service.
+                 (and (not (string=? "XDG_RUNTIME_DIR" variable))
+                      variable)))
+             home-xdg-base-directories-configuration-fields)))
 
 (define (last-extension-or-cfg config extensions)
   "Picks configuration value from last provided extension.  If there
-- 
2.37.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.