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 93A696068; Sun, 11 Apr 2021 12:00:08 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id C84CA5D80; Sun, 11 Apr 2021 11:58:35 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id BD8A05D34; Sun, 11 Apr 2021 11:58:33 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id 5F9985B90 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 C70F85C0056 for ; Sun, 11 Apr 2021 07:57:57 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) 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=y4/lRKJq8xNMM q+pS/jEr4hmomQlVZHDaiTRj4osXpo=; b=RrvnYEKZMpkGbM39c6PT4AeWtftYt KOQIfrX3qSYfvzfmnMJ71k1ad3x2arZAaujWFC7G/KAb8uvp6yk0gMvPpmGTH859 aCWlMqNRVbm8EQUuNExjr5YILMAGntM0FUiz+AVi6oUNAf1k105mm2nScSeA4tu8 VOx2qxE+7Mn9wUN7iiYhv1GmaWSY2eizGqt2Cigt7WhnP98PBoNay8R5FL3CP5gk pXQtqnQDB4K897LZWEKjLHm377W+Pv2tTeh8NHEAIDUZrmjmtdt98zjaXTktsff7 B4hIX7ftJo4a6lYO2PqMo7y1qeVVc/J/A1VBXpyNGZ0diDGcCDTPBJbNw== 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=y4/lRKJq8xNMMq+pS/jEr4hmomQlVZHDaiTRj4osXpo=; b=Dm1J9RgF zo55lYJOluUBEDbPUVtBSoX6wRpYBCC5kMIYBaEjk2kNFHmCL3H3DwbLelgylEqt p4hQdfp6apuVsEDyV+gohxXHgHadrFU81QiXzwmhjP8IDvbYGbKty8HrVTgAaqXH CSJrpU6wO6Gu9UbVeU+X/zqFBmd3QhvRXdsLDV/ovXxboYESqyPq3xey2vkbITkV 6gzRZfjnMb2iVYx7fmOCeCJsWDLwZ1qx+D9GdhxR0R5czC0kLBff5VCe9DDqC/yf oCqHyzMmiE56qP7PZzGItuWH5qRauuids/u7HWxpDBME1zgT+lneQuG+hNeX4wo3 759IvmKSBzZGxA== 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 85019240054 for ; Sun, 11 Apr 2021 07:57:57 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id F1E7018FC; Sun, 11 Apr 2021 11:57:55 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs 10/16] spectrumPackages.rootfs: add dbus configuration Date: Sun, 11 Apr 2021 11:57:34 +0000 Message-Id: <20210411115740.29615-11-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: PQ3S3OR4F4LVGRYR3SDYG23XNGFHJ3CV X-Message-ID-Hash: PQ3S3OR4F4LVGRYR3SDYG23XNGFHJ3CV 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: This doesn't actually include dbus, just sets up its user, group and configuration files. We'll need dbus for connman or NetworkManager. --- pkgs/os-specific/linux/spectrum/rootfs/etc/group | 1 + pkgs/os-specific/linux/spectrum/rootfs/etc/passwd | 1 + pkgs/os-specific/linux/spectrum/rootfs/generic.nix | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/spectrum/rootfs/etc/group b/pkgs/os-specific/linux/spectrum/rootfs/etc/group index e1f50c66958..df4940a5516 100644 --- a/pkgs/os-specific/linux/spectrum/rootfs/etc/group +++ b/pkgs/os-specific/linux/spectrum/rootfs/etc/group @@ -1,2 +1,3 @@ root:x:0:root +messagebus:x:4:messagebus user:x:1000:user diff --git a/pkgs/os-specific/linux/spectrum/rootfs/etc/passwd b/pkgs/os-specific/linux/spectrum/rootfs/etc/passwd index 467ffc9e42c..c76fb8f2a99 100644 --- a/pkgs/os-specific/linux/spectrum/rootfs/etc/passwd +++ b/pkgs/os-specific/linux/spectrum/rootfs/etc/passwd @@ -1,2 +1,3 @@ root:x:0:0:System administrator:/:/bin/sh +messagebus:x:1:1:D-Bus system message bus daemon user:/run/dbus:/bin/sh user:x:1000:1000:User:/:/bin/sh diff --git a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix index ac628de13a3..ae4dd6579f5 100644 --- a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix +++ b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix @@ -1,6 +1,6 @@ { runCommandNoCC, writeScript, writeReferencesToFile, makeFontsConf, lib , dash, execline, s6, s6-rc, s6-portable-utils, s6-linux-utils, s6-linux-init, busybox -, mesa, squashfs-tools-ng +, mesa, squashfs-tools-ng, makeDBusConf }: { services, rcServices ? {}, fonts ? [], path ? [] }: @@ -42,6 +42,10 @@ let ln -s ${stage1} sbin/init cp -r ${./etc} etc chmod u+w etc + ln -s ${makeDBusConf { + suidHelper = "/run/dbus-daemon-launch-helper"; + serviceDirectories = []; + }} etc/dbus-1 mkdir etc/fonts ln -s ${fontsConf} etc/fonts/fonts.conf -- 2.30.0