From aade1b39b380499d88ca26a22ec4e36aac1f48a8 Mon Sep 17 00:00:00 2001
From: Mike Brady <4265913+mikebrady@users.noreply.github.com>
Date: Sun, 9 Jun 2024 18:41:02 +0100
Subject: [PATCH] Move the ulimit -n call from 01-startup/script.sh to the
 02-dbus/run

---
 docker/classic/etc/s6-overlay/s6-rc.d/01-startup/script.sh | 3 ---
 docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/run          | 4 ++++
 docker/etc/s6-overlay/s6-rc.d/01-startup/script.sh         | 3 ---
 docker/etc/s6-overlay/s6-rc.d/02-dbus/run                  | 4 ++++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/01-startup/script.sh b/docker/classic/etc/s6-overlay/s6-rc.d/01-startup/script.sh
index 253c0afa..3037e98a 100644
--- a/docker/classic/etc/s6-overlay/s6-rc.d/01-startup/script.sh
+++ b/docker/classic/etc/s6-overlay/s6-rc.d/01-startup/script.sh
@@ -1,5 +1,2 @@
 #!/bin/sh
 echo "STARTING - $(date)"
-
-# Set the limit to the same value Docker has been using in earlier version.
-ulimit -n 1048576
diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/run b/docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/run
index 15018b7e..f0e4aa50 100644
--- a/docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/run
+++ b/docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/run
@@ -1,3 +1,7 @@
 #!/command/with-contenv sh
+
+# Set the limit to the same value Docker has been using in earlier version.
+ulimit -n 1048576
+
 echo "Starting dbus"
 exec s6-notifyoncheck  dbus-daemon --system --nofork --nopidfile
diff --git a/docker/etc/s6-overlay/s6-rc.d/01-startup/script.sh b/docker/etc/s6-overlay/s6-rc.d/01-startup/script.sh
index 253c0afa..3037e98a 100644
--- a/docker/etc/s6-overlay/s6-rc.d/01-startup/script.sh
+++ b/docker/etc/s6-overlay/s6-rc.d/01-startup/script.sh
@@ -1,5 +1,2 @@
 #!/bin/sh
 echo "STARTING - $(date)"
-
-# Set the limit to the same value Docker has been using in earlier version.
-ulimit -n 1048576
diff --git a/docker/etc/s6-overlay/s6-rc.d/02-dbus/run b/docker/etc/s6-overlay/s6-rc.d/02-dbus/run
index 15018b7e..f0e4aa50 100644
--- a/docker/etc/s6-overlay/s6-rc.d/02-dbus/run
+++ b/docker/etc/s6-overlay/s6-rc.d/02-dbus/run
@@ -1,3 +1,7 @@
 #!/command/with-contenv sh
+
+# Set the limit to the same value Docker has been using in earlier version.
+ulimit -n 1048576
+
 echo "Starting dbus"
 exec s6-notifyoncheck  dbus-daemon --system --nofork --nopidfile
-- 
2.47.2