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 09AF961AE; Sun, 11 Apr 2021 12:00:56 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 3A59B5DB6; Sun, 11 Apr 2021 11:58:37 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 4F9495CEB; Sun, 11 Apr 2021 11:58:35 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id 601C95B32 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 C92DB5C00CE 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=YomK/1VbnBTAO ba9vaQR2eMQWk+wkBm5XWi8CsanhEc=; b=MXqRbpjUw9PynEukYYnG9qBEeOhII /TcB7NCBojTsYfc2DQsy0eJDBIYgfQudHg97lBR/Ei2im9SL+nxlmWL551POcdPJ ArJIRhOTFell1jxiiV6yqhPVGGPAwT2TuxMwKR2TXY8DKQpgkvBCaqZQ0NaxMPsj /XvcySi74SWD1m1DUdSEPjTV6xfH7C6CqfLuJzTKBK6aTgRX4cayCZeltotLXE04 n0q6wlAZ/IrZKJzipiPEyAVlHk7KjQbm+9IyfYeAdOE186rlBdzZW/4cpD0bMhXK WTMjF6dz5MTkA3ZZKyrenqBbPsL0DdejY7IiOdEJxSoJeqERXawc0ICOw== 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=YomK/1VbnBTAOba9vaQR2eMQWk+wkBm5XWi8CsanhEc=; b=e9b4Pm0H EqaFQFE1U+nS9tBF9fGevK3A6xCTmgvW7in7iYC7G9NpgpaU5UjbLrGRtVBRM7lQ gaXq73u2dA3D0Gr//SL8U5cnFuSQcQLGKmTR2EznVJ27ewmvTsvK4BuIWyC5fwkP 6UIyajV7X+KbkENSAo3ZcHk07H1mC6QBDnqTk7Cr4zi37D2hsEbJhtx+3Typt7pS GKLeCdtPgANMtrNCM8DCJ7KAuQ4eS+JVt+q/NT9QBnL2v+v5SUzJ8hIX46iEF5kp Xo/xSfbd67/yI3zl4ICwcLJ51731zknWW+Rsafty4zGdxZWSTV6AoSdfDC7WVS1w nCRb2nqpIwfMuQ== 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 8CBD124005D for ; Sun, 11 Apr 2021 07:57:57 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 101491A42; Sun, 11 Apr 2021 11:57:56 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs 11/16] spectrumPackages.rootfs: add connman dbus services Date: Sun, 11 Apr 2021 11:57:35 +0000 Message-Id: <20210411115740.29615-12-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: S5AWP2XTUS5L4ASBJCM6AQZVGHCJ7DOP X-Message-ID-Hash: S5AWP2XTUS5L4ASBJCM6AQZVGHCJ7DOP 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: At some point we'll want to make it so different VMs don't share this, because only VMs that talk to network hardware will need connman. But this'll do for now. --- pkgs/os-specific/linux/spectrum/rootfs/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix index ae4dd6579f5..56f2d15b103 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, makeDBusConf +, mesa, squashfs-tools-ng, makeDBusConf, connman }: { services, rcServices ? {}, fonts ? [], path ? [] }: @@ -44,7 +44,7 @@ let chmod u+w etc ln -s ${makeDBusConf { suidHelper = "/run/dbus-daemon-launch-helper"; - serviceDirectories = []; + serviceDirectories = [ connman ]; }} etc/dbus-1 mkdir etc/fonts -- 2.30.0