From e73db355b127b9ca2b5339f645f2d3eb6929531f Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sun, 4 Feb 2024 03:19:54 +0100 Subject: [PATCH] services: activation: Ensure /var/run existence. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- gnu/build/install.scm | 2 +- gnu/services.scm | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -134,7 +135,6 @@ (define (directives 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 ;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2023 Brian Cully +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -692,6 +693,7 @@ (define actions (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.