[shepherd] branch master updated: config: Define and use '%runstatedir'.

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch master
in repository shepherd.

The following commit(s) were added to refs/heads/master by this push:
     new 00e74d7  config: Define and use '%runstatedir'.
00e74d7 is described below

commit 00e74d78be3c7b20fd7e04f96e41a153a3f81952
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Aug 18 15:37:34 2023 +0200

    config: Define and use '%runstatedir'.
    
    * modules/shepherd/config.scm.in (%runstatedir): New variable.
    * Makefile.am (instantiate): Add it.
    * modules/shepherd/support.scm (%system-socket-dir): Use it.
    
    Reported-by: Anton Zhukharev <ancieg@altlinux.org>
---
 Makefile.am                    | 1 +
 modules/shepherd/config.scm.in | 2 ++
 modules/shepherd/support.scm   | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index fdfcf3d..0670169 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -196,6 +196,7 @@ instantiate =                                               
\
   -e 's,%modsrcdir%,${abs_top_srcdir}/modules,g'       \
   -e 's,%modbuilddir%,${abs_top_builddir}/modules,g'   \
   -e 's,%localstatedir%,${localstatedir},g'            \
+  -e 's,%runstatedir%,${runstatedir},g'                        \
   -e 's,%pkglibdir%,${pkglibdir},g'                    \
   -e 's,%sysconfdir%,${sysconfdir},g'                  \
   -e 's,%localedir%,${localedir},g'                    \
diff --git a/modules/shepherd/config.scm.in b/modules/shepherd/config.scm.in
index 292a6a2..8df0ad8 100644
--- a/modules/shepherd/config.scm.in
+++ b/modules/shepherd/config.scm.in
@@ -4,6 +4,7 @@
   #:export (Version
             Prefix-dir
             %localstatedir
+            %runstatedir
             %sysconfdir
             %localedir
             %pkglibdir
@@ -14,6 +15,7 @@
 (define Version "%VERSION%")
 (define Prefix-dir "%PREFIX%")
 (define %localstatedir "%localstatedir%")
+(define %runstatedir "%runstatedir%")
 (define %sysconfdir "%sysconfdir%")
 (define %localedir "%localedir%")
 (define %pkglibdir "%pkglibdir%")
diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm
index 0cddc03..2b5f698 100644
--- a/modules/shepherd/support.scm
+++ b/modules/shepherd/support.scm
@@ -437,7 +437,7 @@ create a template configuration file if non exists."
 
 ;; Socket directory for the system's instance (PID 1).
 (define %system-socket-dir
-  (string-append %localstatedir "/run/shepherd"))
+  (string-append %runstatedir "/shepherd"))
 
 ;; The directory where the socket resides.
 (define default-socket-dir