From patchwork Sun Feb 4 02:19:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 59748 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8D0B427BBEB; Sun, 4 Feb 2024 02:21:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1A38D27BBE9 for ; Sun, 4 Feb 2024 02:21:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rWS7r-0006NQ-Gt; Sat, 03 Feb 2024 21:20:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rWS7n-0006M0-L3 for guix-patches@gnu.org; Sat, 03 Feb 2024 21:20:52 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rWS7n-0004B2-7T for guix-patches@gnu.org; Sat, 03 Feb 2024 21:20:51 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rWS7y-0006ae-Rz for guix-patches@gnu.org; Sat, 03 Feb 2024 21:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65335] [PATCH v3 3/5] gnu: build: activation: Ensure /run existence. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Feb 2024 02:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65335@debbugs.gnu.org Cc: ludo@gnu.org, ngraves@ngraves.fr Received: via spool by 65335-submit@debbugs.gnu.org id=B65335.170701323125242 (code B ref 65335); Sun, 04 Feb 2024 02:21:02 +0000 Received: (at 65335) by debbugs.gnu.org; 4 Feb 2024 02:20:31 +0000 Received: from localhost ([127.0.0.1]:47369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWS7S-0006Yz-SB for submit@debbugs.gnu.org; Sat, 03 Feb 2024 21:20:31 -0500 Received: from 3.mo560.mail-out.ovh.net ([46.105.58.226]:60703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWS7Q-0006YM-Bn for 65335@debbugs.gnu.org; Sat, 03 Feb 2024 21:20:29 -0500 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.176.211]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id E710A269E5 for <65335@debbugs.gnu.org>; Sun, 4 Feb 2024 02:20:14 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-xfz5d (unknown [10.108.42.247]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 8D0821FD59; Sun, 4 Feb 2024 02:20:13 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-6684bf9d7b-xfz5d with ESMTPSA id Lw0BKV30vmVmEgkA0jpIEA (envelope-from ); Sun, 04 Feb 2024 02:20:13 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-95G001f9a2a8f3-ec74-48d2-9645-34bb15f8f0dd, CDD90146079FDB87F723A7A7FD21F5F4569C6C59) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Sun, 4 Feb 2024 03:19:55 +0100 Message-ID: <20240204022004.2785-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240204022004.2785-1-ngraves@ngraves.fr> References: <20240204022004.2785-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 17608511593401934557 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrfedujedggeeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeiheeffeehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtpdhmohguvgepshhmthhpohhuth X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/build/activation.scm (activation-script): Ensure /var/run existence. * gnu/build/install.scm (evaluate-populate-directive) [directives]: Remove directory /run. Change-Id: I19ca8e7605c0cff598ab89077a94e20390ba27b0 --- 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 ;;; Copyright © 2020 Christine Lemmer-Webber ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -408,6 +409,7 @@ (define* (activate-current-system (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 @@ (define (directives 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)