summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-04-10 00:09:13 +0000
committerAlyssa Ross <hi@alyssa.is>2021-04-14 23:38:44 +0000
commite73506be2a29a29c6507285393aec81181061cb1 (patch)
tree5661cf4ed4eadd0df79141fa6a125c651983df82
parent52e93c79d825b8355888e1efaf3ed5b3a8ec07cc (diff)
downloadnixpkgs-e73506be2a29a29c6507285393aec81181061cb1.tar
nixpkgs-e73506be2a29a29c6507285393aec81181061cb1.tar.gz
nixpkgs-e73506be2a29a29c6507285393aec81181061cb1.tar.bz2
nixpkgs-e73506be2a29a29c6507285393aec81181061cb1.tar.lz
nixpkgs-e73506be2a29a29c6507285393aec81181061cb1.tar.xz
nixpkgs-e73506be2a29a29c6507285393aec81181061cb1.tar.zst
nixpkgs-e73506be2a29a29c6507285393aec81181061cb1.zip
spectrumPackages.rootfs: add connman dbus services
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.

Message-Id: <20210411115740.29615-12-hi@alyssa.is>
Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>
-rw-r--r--pkgs/os-specific/linux/spectrum/rootfs/generic.nix4
1 files 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