guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/05: services: activation: Ensure /run existence.


From: guix-commits
Subject: 03/05: services: activation: Ensure /run existence.
Date: Mon, 19 Feb 2024 12:44:45 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 27ee6f06d0ecab58ca3b739c911bacefda440177
Author: Nicolas Graves <ngraves@ngraves.fr>
AuthorDate: Sun Feb 4 03:19:55 2024 +0100

    services: activation: Ensure /run existence.
    
    * gnu/build/activation.scm (activation-script): Ensure /var/run existence.
    * gnu/build/install.scm (evaluate-populate-directive)
    [directives]: Remove directory /run.
    
    Change-Id: I19ca8e7605c0cff598ab89077a94e20390ba27b0
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/build/activation.scm | 2 ++
 gnu/build/install.scm    | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm
index eea2233563..d8c0cd22a3 100644
--- a/gnu/build/activation.scm
+++ b/gnu/build/activation.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2020 Christine Lemmer-Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -408,6 +409,7 @@ improvement."
 
   (format #t "making '~a' the current system...~%" system)
 
+  (mkdir-p "/run")
   ;; Atomically make SYSTEM current.
   (let ((new (string-append %current-system ".new")))
     (symlink system new)
diff --git a/gnu/build/install.scm b/gnu/build/install.scm
index 618a51af8e..0aa227b4d8 100644
--- a/gnu/build/install.scm
+++ b/gnu/build/install.scm
@@ -135,7 +135,6 @@ STORE."
     (directory "/var/guix/gcroots")
     (directory "/var/empty")                        ; for no-login accounts
     (directory "/var/db")                           ; for dhclient, etc.
-    (directory "/run")
     (directory "/mnt")
     (directory "/var/guix/profiles/per-user/root" 0 0)
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]