From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 Received: by atuin.qyliss.net (Postfix, from userid 496) id 28BD360E3; Sun, 11 Apr 2021 12:00:23 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id E9DC95DB0; Sun, 11 Apr 2021 11:58:36 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 819345CD1; Sun, 11 Apr 2021 11:58:34 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id 1FF4B5B31 for ; Sun, 11 Apr 2021 11:57:58 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 8AF075C00E9 for ; Sun, 11 Apr 2021 07:57:57 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 11 Apr 2021 07:57:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=1YylnHmDf9rBw BAR1f3Xa/9rBoRKsKx2ee3S4aszDu8=; b=h2x307xC5p1V1NuIRLDfQ/eisIWyh qmEyg6rMpkhqd9TF2m1q1WrEP/0FuVvkfAt6HkY05lbGw3LSPO/cBS42uKD3DDH0 9iO8zFa913N0grCjDruAnOB+EkhRV28IWLEAqeHb6LC2zNTyJymRAmM7lcIq3O47 yt0WIdxEG+0Z6CHXnzU9l5QVyZd1YHdpXLsv2H0ZG1oqiogOAYop19c1ivS5Rzw1 zBIzEhJlocnycuIRKjpXjI51Gfr5Z53Qywfmn6W1NDfHRvIetW4PY0ADHeQJBdhv zSZ8Yd5zVMdTg4FUR3nYdtJrofNtEYpJA/oYSBuK2khXJIn1a+NLQDQEA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=1YylnHmDf9rBwBAR1f3Xa/9rBoRKsKx2ee3S4aszDu8=; b=u5YNt+l/ aDYNJrvcIpiAcgs/v+1lotveAOBBgTsKjIbJbttWDGy95vboALJZj6z3PqskVMpA 3xH8TeQT5lRk5vmTv2fxXO9zAMhNS7RB86FDbj8KRJt17oXowrw19VUxD7evzBrE MdiyFpSHkHt492aBzl+4nsHNDcDddMO8kuUR1gS7ycSSzffyOXe4IH+WcT6aFKax EEcaW/UoRyaR3UYi3k+x8KzqCJND0Kjfr0IyVuaL3ncGxhreHLi5mdDWTPDdBrC3 c0hm/bM4fFUQvykXKS7mKJfhu7JgqcSsZrdq1U4o00NfiIVjsHsVeUJf356WcDcz t6bZ5wyXqTDZAg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudekgedgudejhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeetlhihshhsrgcutfhoshhsuceohhhisegrlhihshhsrgdr ihhsqeenucggtffrrghtthgvrhhnpefgfedukedvleeileeludefveehgeelgfegvdduje dvtdffueeuveffheeljeekvdenucfkphepjeelrddvfeehrdduudelrddutdejnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepqhihlhhishhsse igvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Received: from x220.qyliss.net (p4feb776b.dip0.t-ipconnect.de [79.235.119.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 4E97A1080057 for ; Sun, 11 Apr 2021 07:57:57 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id DCB8A192C; Sun, 11 Apr 2021 11:57:55 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs 09/16] spectrumPackages.rootfs: make /var/lib and /var/run Date: Sun, 11 Apr 2021 11:57:33 +0000 Message-Id: <20210411115740.29615-10-hi@alyssa.is> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210411115740.29615-1-hi@alyssa.is> References: <20210411115740.29615-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: HJKFKT64YM2KU6MSACAKGUDPOO2ANMFU X-Message-ID-Hash: HJKFKT64YM2KU6MSACAKGUDPOO2ANMFU X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.3.1 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Needed by some programs. There's no persistance in /var/lib for now (or anywhere else for that matter). --- pkgs/os-specific/linux/spectrum/rootfs/generic.nix | 3 ++- pkgs/os-specific/linux/spectrum/rootfs/stage1.nix | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix index 4122abf80c6..ac628de13a3 100644 --- a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix +++ b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix @@ -36,7 +36,8 @@ let mkdir $out cd $out - mkdir bin sbin dev proc run sys tmp + mkdir -p bin sbin dev proc run sys tmp var/lib + ln -s /run var/run ln -s ${dash}/bin/dash bin/sh ln -s ${stage1} sbin/init cp -r ${./etc} etc diff --git a/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix b/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix index 13de2d09876..de10d60ffb6 100644 --- a/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix +++ b/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix @@ -26,10 +26,13 @@ writeScript "init-stage1" '' if { s6-mkdir -p /run/user/0 /dev/pts /dev/shm } if { install -o user -g user -d /run/user/1000 } + if { s6-mount -t devpts -o gid=4,mode=620 none /dev/pts } if { s6-mount -t tmpfs none /dev/shm } + if { s6-mount -t tmpfs none /var/lib } if { s6-mount -t proc none /proc } if { s6-mount -t sysfs none /sys } + if { s6-ln -s ${mesa.drivers} /run/opengl-driver } s6-rc change ok-all -- 2.30.0