gerrit.automotivelinux Code Review - AGL/meta-agl-devel.git/blob

   1 From a2d324c75057f0ddd66cbe5b5e419fddda213cc2 Mon Sep 17 00:00:00 2001
   2 From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
   3 Date: Mon, 28 Feb 2022 06:46:19 +0530
   4 Subject: [PATCH] systemd: changes to run wireplumber instances in containers
   5
   6 - remove the pipewire daemon dependencies so that
   7 only wireplumber policy daemon can run in containers.
   8 - remove pipewire user
   9 ---
  10  src/systemd/system/wireplumber@.service.in | 8 +++-----
  11  src/systemd/user/wireplumber@.service.in   | 5 ++---
  12  2 files changed, 5 insertions(+), 8 deletions(-)
  13
  14  Inappropriate [configuration]
  15
  16 diff --git a/src/systemd/system/wireplumber@.service.in b/src/systemd/system/wireplumber@.service.in
  17 index ba8eefe..e4b985b 100644
  18 --- a/src/systemd/system/wireplumber@.service.in
  19 +++ b/src/systemd/system/wireplumber@.service.in
  20 @@ -5,8 +5,7 @@
  21  # wireplumber@policy.service loads policy.conf, etc.
  22  [Unit]
  23  Description=Multimedia Service Session Manager (%i)
  24 -After=pipewire.service
  25 -BindsTo=pipewire.service
  26 +After=sockets.target
  27  Conflicts=pipewire-media-session.service
  28
  29  [Service]
  30 @@ -19,9 +18,8 @@ SystemCallFilter=@system-service
  31  Type=simple
  32  ExecStart=@WP_BINARY@ -c %i.conf
  33  Restart=on-failure
  34 -User=pipewire
  35 -Environment=PIPEWIRE_RUNTIME_DIR=%t/pipewire
  36 +Environment=PIPEWIRE_RUNTIME_DIR=/var
  37  Environment=GIO_USE_VFS=local
  38
  39  [Install]
  40 -WantedBy=pipewire.service
  41 +WantedBy=multi-user.target
  42 diff --git a/src/systemd/user/wireplumber@.service.in b/src/systemd/user/wireplumber@.service.in
  43 index 9dbceff..7e21194 100644
  44 --- a/src/systemd/user/wireplumber@.service.in
  45 +++ b/src/systemd/user/wireplumber@.service.in
  46 @@ -5,8 +5,7 @@
  47  # wireplumber@policy.service loads policy.conf, etc.
  48  [Unit]
  49  Description=Multimedia Service Session Manager (%i)
  50 -After=pipewire.service
  51 -BindsTo=pipewire.service
  52 +After=sockets.target
  53  Conflicts=pipewire-media-session.service
  54
  55  [Service]
  56 @@ -23,4 +22,4 @@ Slice=session.slice
  57  Environment=GIO_USE_VFS=local
  58
  59  [Install]
  60 -WantedBy=pipewire.service
  61 +WantedBy=multi-user.target
  62 --
  63 2.35.1
  64