From ad526a4c32a501d723452a2109054f3c2134c48e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Wed, 14 Oct 2026 14:57:12 +0200
Subject: [PATCH] fix(dev): restore s6 user bundle in user-bundles.d

The MCP merge (#12163) moved the bundle back to s6-rc.d, which overrides
the serversideup v5 bundle and stops php-fpm and nginx from starting.
---
 .../{s6-rc.d => user-bundles.d}/user/contents.d/horizon           | 0
 .../{s6-rc.d => user-bundles.d}/user/contents.d/init-setup        | 0
 .../s6-overlay/{s6-rc.d => user-bundles.d}/user/contents.d/reverb | 0
 .../{s6-rc.d => user-bundles.d}/user/contents.d/scheduler-worker  | 0
 .../{s6-rc.d => user-bundles.d}/user/contents.d/terminal-server   | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename docker/development/etc/s6-overlay/{s6-rc.d => user-bundles.d}/user/contents.d/horizon (100%)
 rename docker/development/etc/s6-overlay/{s6-rc.d => user-bundles.d}/user/contents.d/init-setup (100%)
 rename docker/development/etc/s6-overlay/{s6-rc.d => user-bundles.d}/user/contents.d/reverb (100%)
 rename docker/development/etc/s6-overlay/{s6-rc.d => user-bundles.d}/user/contents.d/scheduler-worker (100%)
 rename docker/development/etc/s6-overlay/{s6-rc.d => user-bundles.d}/user/contents.d/terminal-server (100%)

diff --git a/docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/horizon b/docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/horizon
similarity index 100%
rename from docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/horizon
rename to docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/horizon
diff --git a/docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup b/docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/init-setup
similarity index 100%
rename from docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup
rename to docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/init-setup
diff --git a/docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/reverb b/docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/reverb
similarity index 100%
rename from docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/reverb
rename to docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/reverb
diff --git a/docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/scheduler-worker b/docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/scheduler-worker
similarity index 100%
rename from docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/scheduler-worker
rename to docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/scheduler-worker
diff --git a/docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/terminal-server b/docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/terminal-server
similarity index 100%
rename from docker/development/etc/s6-overlay/s6-rc.d/user/contents.d/terminal-server
rename to docker/development/etc/s6-overlay/user-bundles.d/user/contents.d/terminal-server