spectrumPackages.rootfs: add dbus configuration

This doesn't actually include dbus, just sets up its user, group and
configuration files.  We'll need dbus for connman or NetworkManager.

Message-Id: <20210411115740.29615-11-hi@alyssa.is>
Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>

3 files changed, 7 insertions, 1 deletions

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