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.3 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 D221530A1; Mon, 15 Mar 2021 13:58:36 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 4C96C3074; Mon, 15 Mar 2021 13:58:29 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id A53CD2FF5; Mon, 15 Mar 2021 13:58:27 +0000 (UTC) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by atuin.qyliss.net (Postfix) with ESMTPS id 2C8782FF4 for ; Mon, 15 Mar 2021 13:58:25 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 5041A5C015B for ; Mon, 15 Mar 2021 09:58:24 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 15 Mar 2021 09:58:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=EZtct0LRZa9panfKkJq5mj0pEx Tny8zi4YHqpGvxh8c=; b=LTM92x4YAdlp8aQznKxW6CZVbOpvKydunO4KDKtgyZ r6kXpCA9GUuGCEQOTPGt4sniXb9qZeZ1EUsGIfx3fJ4aEuKFfcabk+0ypdFTAH8q jhQRn6/rGWNU5hT9MiA6yUAW9cvueUnYqNFvtgUPV1uFQjw7+udMrDaHelWz+6Bw kAE48NJhcl8XVNNT5OQnYClvQGuHjrwhw3KJi0hc3h2r4zjIJlxXX2RPOSdYi7eP AbBMlwoiiKkMv3upq4BO7MDgsdkd3ylnGMWdjxzZf3BhYScEYaeoh1+Md6r/jtzw 4Rh5+XVfE8SUcqIY+38tY5Qdlsx/gV2totHlhdaCG37w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=EZtct0LRZa9panfKk Jq5mj0pExTny8zi4YHqpGvxh8c=; b=AYmBoKktSmHhqfB+GLAbJuPdzrkje2ULz 5N8Cg2tPvheCa0qFExZVJfiSbRVdM2dkGHZusCPJ+eqoA6vPJq7MzPwiwb09XK9f hUDt42SFj5CZx6TWXM50I1/maJsWPg9qrz0YOG0QT8ahnQs1b52Z+cL/n5T9Bgpb ZHgrcLtBUopV/X85aq0Kw4T4dnM+bSpDyDEQobMBakv01qI5uBYZqey6nBx0UnBR WhpWPOn1btK+1rMc+y0WM19nE4gBouvRXHKKQi+CLYC7X9umdf5xYXc9+F4Z+6Z/ yhG75Fj9fL7xBDhyyHHW36yoTSPf3UyvnWaufeQSMPOXHYg/gtxPQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddvledgheejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhisheq necuggftrfgrthhtvghrnhephedvfffghfetieejgfetfedtgffhvdehueehvdejudfgge fgleejgfelfeevgfefnecukfhppeekgedrudekgedrvdefvddrudektdenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehqhihlihhsshesgidvvd dtrdhqhihlihhsshdrnhgvth X-ME-Proxy: Received: from x220.qyliss.net (p54b8e8b4.dip0.t-ipconnect.de [84.184.232.180]) by mail.messagingengine.com (Postfix) with ESMTPA id D0D7B24005D for ; Mon, 15 Mar 2021 09:58:23 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 0BC8E1AA6; Mon, 15 Mar 2021 13:58:22 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs] spectrumPackages.rootfs: fix custom path entries Date: Mon, 15 Mar 2021 13:58:20 +0000 Message-Id: <20210315135820.6375-1-hi@alyssa.is> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SDGPO32MKRTKMJPZDTNU4RJC5N4USEQ6 X-Message-ID-Hash: SDGPO32MKRTKMJPZDTNU4RJC5N4USEQ6 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: Stage 1 was supposed to be able to take a list of PATH entries to prepend to the default PATH, but it didn't do anything with them. Now, it properly adds them to the PATH as early as possible during boot. This mechanism isn't currently used anywhere, but is very useful for debugging. --- pkgs/os-specific/linux/spectrum/rootfs/generic.nix | 3 ++- pkgs/os-specific/linux/spectrum/rootfs/stage1.nix | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix b/pkgs/os= -specific/linux/spectrum/rootfs/generic.nix index 0a99f99bd5b..81fb80a614f 100644 --- a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix +++ b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix @@ -8,7 +8,8 @@ let makeStage1 =3D import ./stage1.nix { inherit writeScript lib - execline s6 s6-portable-utils s6-linux-utils s6-linux-init busybox= mesa; + execline s6 s6-portable-utils s6-linux-utils s6-linux-init busybox= mesa + path; }; =20 makeServicesDir =3D import ./services.nix { diff --git a/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix b/pkgs/os-= specific/linux/spectrum/rootfs/stage1.nix index be7853316e9..6caf9ff93b8 100644 --- a/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix +++ b/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix @@ -1,16 +1,19 @@ { writeScript, lib , execline, s6, s6-portable-utils, s6-linux-utils, s6-linux-init, busybo= x, mesa +, path ? [] }: =20 { run ? "true" }: =20 let - path =3D [ s6 s6-portable-utils s6-linux-utils s6-linux-init busybox e= xecline ]; + path' =3D path ++ [ + s6 s6-portable-utils s6-linux-utils s6-linux-init busybox execline + ]; in =20 writeScript "init-stage1" '' #! ${execline}/bin/execlineb -P - export PATH ${lib.makeBinPath path} + export PATH ${lib.makeBinPath path'} ${s6}/bin/s6-setsid -qb -- =20 importas -i spectrumcmd spectrumcmd --=20 2.30.0