From 8dfc9a6d5557d7970b6c9eb0972cfb82673eb284 Mon Sep 17 00:00:00 2001 From: FoxxMD Date: Tue, 8 Jul 2025 19:53:55 +0000 Subject: [PATCH] refactor(mpris): Remove socat service in favor of simplified dbus connection Can connect to dbus over TCP socket using ENV which is much simpler. --- .../svc-socat/dependencies.d/init-services | 0 .../etc/s6-overlay/s6-rc.d/svc-socat/finish | 10 --------- .../root/etc/s6-overlay/s6-rc.d/svc-socat/run | 22 ------------------- .../etc/s6-overlay/s6-rc.d/svc-socat/type | 1 - .../s6-rc.d/user/contents.d/svc-socat | 0 5 files changed, 33 deletions(-) delete mode 100644 docker/root/etc/s6-overlay/s6-rc.d/svc-socat/dependencies.d/init-services delete mode 100644 docker/root/etc/s6-overlay/s6-rc.d/svc-socat/finish delete mode 100755 docker/root/etc/s6-overlay/s6-rc.d/svc-socat/run delete mode 100644 docker/root/etc/s6-overlay/s6-rc.d/svc-socat/type delete mode 100644 docker/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-socat diff --git a/docker/root/etc/s6-overlay/s6-rc.d/svc-socat/dependencies.d/init-services b/docker/root/etc/s6-overlay/s6-rc.d/svc-socat/dependencies.d/init-services deleted file mode 100644 index e69de29b..00000000 diff --git a/docker/root/etc/s6-overlay/s6-rc.d/svc-socat/finish b/docker/root/etc/s6-overlay/s6-rc.d/svc-socat/finish deleted file mode 100644 index 613a6623..00000000 --- a/docker/root/etc/s6-overlay/s6-rc.d/svc-socat/finish +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/with-contenv bash - -if [ $1 -ne 0 ]; then - echo -e "-------------------------------------\n" - echo -e "socat failed to start! It will NOT restart\n" - echo -e "-------------------------------------\n" -fi - -# signal to s6 this service should not be re-run -exit 125 \ No newline at end of file diff --git a/docker/root/etc/s6-overlay/s6-rc.d/svc-socat/run b/docker/root/etc/s6-overlay/s6-rc.d/svc-socat/run deleted file mode 100755 index 44d4f936..00000000 --- a/docker/root/etc/s6-overlay/s6-rc.d/svc-socat/run +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/with-contenv bash - -if [ ! -z "$SOCAT_PORT" ]; then - -user_id=$(id -u abc) -path="/run/user/$user_id/bus" - -echo -e "Starting socat for uid $user_id at unix scoket $path and listening on port $SOCAT_PORT" - -# on host do -# socat TCP-LISTEN:$SOCAT_PORT,reuseaddr,fork UNIX-CONNECT:/run/user/$user_id/bus -mkdir -p /run/user/$user_id -touch /run/user/$user_id/bus -chmod 666 /run/user/$user_id/bus -chown -R abc:abc /run/user/$user_id - -exec \ - s6-setuidgid abc socat UNIX-LISTEN:/run/user/$user_id/bus,fork,reuseaddr,unlink-early,user=abc,group=abc,mode=666 TCP:0.0.0.0:$SOCAT_PORT - -else - echo "Not starting socat" -fi \ No newline at end of file diff --git a/docker/root/etc/s6-overlay/s6-rc.d/svc-socat/type b/docker/root/etc/s6-overlay/s6-rc.d/svc-socat/type deleted file mode 100644 index 5883cff0..00000000 --- a/docker/root/etc/s6-overlay/s6-rc.d/svc-socat/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/docker/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-socat b/docker/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-socat deleted file mode 100644 index e69de29b..00000000