refactor to be in sync with other bases

linuxserver · Jun 25, 2024 · 8cb332e · 8cb332e
1 parent 9f42fe8
commit 8cb332e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 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
@@ -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
@@ -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 \