summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Graves <ngraves@ngraves.fr>2024-02-04 03:19:54 +0100
committerLudovic Courtès <ludo@gnu.org>2024-02-19 18:41:47 +0100
commite73db355b127b9ca2b5339f645f2d3eb6929531f (patch)
tree0a53c6cbebb12e8ec63dff87f5dfe2e7426780ad
parenta5f66c2446c61a072413e417b27fb9499f8b42fa (diff)
services: activation: Ensure /var/run existence.
* gnu/services.scm (activation-script): Ensure /var/run existence. * gnu/build/install.scm (evaluate-populate-directive) [directives]: Remove directory /var/run. Change-Id: I5fb93d33b6b1f045f1e5ba206b9b0b74b5184260 Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--gnu/build/install.scm2
-rw-r--r--gnu/services.scm2
2 files changed, 3 insertions, 1 deletions
diff --git a/gnu/build/install.scm b/gnu/build/install.scm
index d4982650c1..618a51af8e 100644
--- a/gnu/build/install.scm
+++ b/gnu/build/install.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2013-2020, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -134,7 +135,6 @@ STORE."
(directory "/var/guix/gcroots")
(directory "/var/empty") ; for no-login accounts
(directory "/var/db") ; for dhclient, etc.
- (directory "/var/run")
(directory "/run")
(directory "/mnt")
(directory "/var/guix/profiles/per-user/root" 0 0)
diff --git a/gnu/services.scm b/gnu/services.scm
index 23c3d8a9f4..59481af10f 100644
--- a/gnu/services.scm
+++ b/gnu/services.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2020 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2023 Brian Cully <bjc@spork.org>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -692,6 +693,7 @@ ACTIVATION-SCRIPT-TYPE."
(use-modules (gnu build activation)
(guix build utils))
+ (mkdir-p "/var/run")
;; Make sure the user accounting database exists. If it
;; does not exist, 'setutxent' does not create it and
;; thus there is no accounting at all.