From c4593eaed3c5e0c7e58cd4486a5ef17bdf759f24 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 12 Dec 2023 08:46:59 +0100 Subject: [PATCH] Use new-style s6-rc to initialize ALSA to avoid race conditions (#156) --- rootfs/etc/s6-overlay/s6-rc.d/alsa-init/dependencies.d/alsa | 0 rootfs/etc/s6-overlay/s6-rc.d/alsa-init/type | 1 + rootfs/etc/s6-overlay/s6-rc.d/alsa-init/up | 1 + rootfs/etc/s6-overlay/s6-rc.d/alsa/dependencies.d/base | 0 .../etc/s6-overlay/s6-rc.d/pulseaudio/dependencies.d/alsa-init | 0 rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/alsa-init | 0 rootfs/etc/{cont-init.d => s6-overlay/scripts}/alsa-mixer.sh | 0 7 files changed, 2 insertions(+) create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/alsa-init/dependencies.d/alsa create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/alsa-init/type create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/alsa-init/up create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/alsa/dependencies.d/base create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/pulseaudio/dependencies.d/alsa-init create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/alsa-init rename rootfs/etc/{cont-init.d => s6-overlay/scripts}/alsa-mixer.sh (100%) diff --git a/rootfs/etc/s6-overlay/s6-rc.d/alsa-init/dependencies.d/alsa b/rootfs/etc/s6-overlay/s6-rc.d/alsa-init/dependencies.d/alsa new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/alsa-init/type b/rootfs/etc/s6-overlay/s6-rc.d/alsa-init/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/alsa-init/type @@ -0,0 +1 @@ +oneshot diff --git a/rootfs/etc/s6-overlay/s6-rc.d/alsa-init/up b/rootfs/etc/s6-overlay/s6-rc.d/alsa-init/up new file mode 100644 index 0000000..abd57b8 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/alsa-init/up @@ -0,0 +1 @@ +/etc/s6-overlay/scripts/alsa-mixer.sh diff --git a/rootfs/etc/s6-overlay/s6-rc.d/alsa/dependencies.d/base b/rootfs/etc/s6-overlay/s6-rc.d/alsa/dependencies.d/base new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/pulseaudio/dependencies.d/alsa-init b/rootfs/etc/s6-overlay/s6-rc.d/pulseaudio/dependencies.d/alsa-init new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/alsa-init b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/alsa-init new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/cont-init.d/alsa-mixer.sh b/rootfs/etc/s6-overlay/scripts/alsa-mixer.sh similarity index 100% rename from rootfs/etc/cont-init.d/alsa-mixer.sh rename to rootfs/etc/s6-overlay/scripts/alsa-mixer.sh