From 9f42fe8d6e8a15ad5ae41d99fc1758f04b5c9c99 Mon Sep 17 00:00:00 2001 From: thelamer Date: Tue, 25 Jun 2024 15:12:54 -0400 Subject: [PATCH 1/2] add mic support master --- root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run b/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run index db7590d..14415b6 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run @@ -60,3 +60,15 @@ elif ! diff -q /proot-apps/pversion ${HOME}/.local/bin/pversion > /dev/null; the cp /proot-apps/* ${HOME}/.local/bin/ chown abc:abc ${HOME}/.local/bin/{ncat,proot-apps,proot,jq,pversion} fi + +# Mic Setup +s6-setuidgid abc pactl \ + load-module module-pipe-source \ + source_name=virtmic \ + file=/defaults/mic.sock \ + source_properties=device.description=LSIOMic \ + format=s16le \ + rate=44100 \ + channels=1 +s6-setuidgid abc pactl \ + set-default-source virtmic From 8cb332e035a4660247eefef0498091d99b7f6579 Mon Sep 17 00:00:00 2001 From: thelamer Date: Tue, 25 Jun 2024 16:28:33 -0400 Subject: [PATCH 2/2] refactor to be in sync with other bases --- .../s6-overlay/s6-rc.d/init-kasmvnc-config/run | 12 ------------ root/etc/s6-overlay/s6-rc.d/svc-kclient/run | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run b/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run index 14415b6..db7590d 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-kasmvnc-config/run @@ -60,15 +60,3 @@ elif ! diff -q /proot-apps/pversion ${HOME}/.local/bin/pversion > /dev/null; the cp /proot-apps/* ${HOME}/.local/bin/ chown abc:abc ${HOME}/.local/bin/{ncat,proot-apps,proot,jq,pversion} fi - -# Mic Setup -s6-setuidgid abc pactl \ - load-module module-pipe-source \ - source_name=virtmic \ - file=/defaults/mic.sock \ - source_properties=device.description=LSIOMic \ - format=s16le \ - rate=44100 \ - channels=1 -s6-setuidgid abc pactl \ - set-default-source virtmic diff --git a/root/etc/s6-overlay/s6-rc.d/svc-kclient/run b/root/etc/s6-overlay/s6-rc.d/svc-kclient/run index 8342c6a..5df967b 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-kclient/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-kclient/run @@ -1,5 +1,23 @@ #!/usr/bin/with-contenv bash +# Mic Setup +if [ ! -f '/dev/shm/mic.lock' ]; then + until [ -f /defaults/pid ]; do + sleep .5 + done + s6-setuidgid abc with-contenv pactl \ + load-module module-pipe-source \ + source_name=virtmic \ + file=/defaults/mic.sock \ + source_properties=device.description=LSIOMic \ + format=s16le \ + rate=44100 \ + channels=1 + s6-setuidgid abc with-contenv pactl \ + set-default-source virtmic + touch /dev/shm/mic.lock +fi + # NodeJS wrapper cd /kclient exec s6-setuidgid abc \