From 03fb1d69de92ef96b11870fce0109297f1679aa4 Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Wed, 17 Sep 2025 14:27:12 +0100 Subject: [PATCH] Remove obsolete s6-overlay stuff. This directory was not copied into the Docker image anyway... --- docker/etc/s6-overlay/s6-rc.d/01-startup/dependencies | 1 - docker/etc/s6-overlay/s6-rc.d/01-startup/script.sh | 2 -- docker/etc/s6-overlay/s6-rc.d/01-startup/type | 1 - docker/etc/s6-overlay/s6-rc.d/01-startup/up | 1 - docker/etc/s6-overlay/s6-rc.d/02-dbus/data/check | 2 -- docker/etc/s6-overlay/s6-rc.d/02-dbus/dependencies | 1 - docker/etc/s6-overlay/s6-rc.d/02-dbus/finish | 2 -- docker/etc/s6-overlay/s6-rc.d/02-dbus/notification-fd | 1 - docker/etc/s6-overlay/s6-rc.d/02-dbus/run | 7 ------- docker/etc/s6-overlay/s6-rc.d/02-dbus/type | 1 - docker/etc/s6-overlay/s6-rc.d/03-avahi/data/check | 10 ---------- docker/etc/s6-overlay/s6-rc.d/03-avahi/dependencies | 1 - docker/etc/s6-overlay/s6-rc.d/03-avahi/finish | 2 -- docker/etc/s6-overlay/s6-rc.d/03-avahi/notification-fd | 1 - docker/etc/s6-overlay/s6-rc.d/03-avahi/run | 3 --- docker/etc/s6-overlay/s6-rc.d/03-avahi/type | 1 - docker/etc/s6-overlay/s6-rc.d/04-nqptp/dependencies | 1 - docker/etc/s6-overlay/s6-rc.d/04-nqptp/finish | 2 -- docker/etc/s6-overlay/s6-rc.d/04-nqptp/run | 3 --- docker/etc/s6-overlay/s6-rc.d/04-nqptp/type | 1 - .../etc/s6-overlay/s6-rc.d/user/contents.d/01-startup | 0 docker/etc/s6-overlay/s6-rc.d/user/contents.d/02-dbus | 0 docker/etc/s6-overlay/s6-rc.d/user/contents.d/03-avahi | 0 docker/etc/s6-overlay/s6-rc.d/user/contents.d/04-nqptp | 0 24 files changed, 44 deletions(-) delete mode 100644 docker/etc/s6-overlay/s6-rc.d/01-startup/dependencies delete mode 100755 docker/etc/s6-overlay/s6-rc.d/01-startup/script.sh delete mode 100644 docker/etc/s6-overlay/s6-rc.d/01-startup/type delete mode 100644 docker/etc/s6-overlay/s6-rc.d/01-startup/up delete mode 100755 docker/etc/s6-overlay/s6-rc.d/02-dbus/data/check delete mode 100644 docker/etc/s6-overlay/s6-rc.d/02-dbus/dependencies delete mode 100644 docker/etc/s6-overlay/s6-rc.d/02-dbus/finish delete mode 100644 docker/etc/s6-overlay/s6-rc.d/02-dbus/notification-fd delete mode 100644 docker/etc/s6-overlay/s6-rc.d/02-dbus/run delete mode 100644 docker/etc/s6-overlay/s6-rc.d/02-dbus/type delete mode 100755 docker/etc/s6-overlay/s6-rc.d/03-avahi/data/check delete mode 100644 docker/etc/s6-overlay/s6-rc.d/03-avahi/dependencies delete mode 100644 docker/etc/s6-overlay/s6-rc.d/03-avahi/finish delete mode 100644 docker/etc/s6-overlay/s6-rc.d/03-avahi/notification-fd delete mode 100644 docker/etc/s6-overlay/s6-rc.d/03-avahi/run delete mode 100644 docker/etc/s6-overlay/s6-rc.d/03-avahi/type delete mode 100644 docker/etc/s6-overlay/s6-rc.d/04-nqptp/dependencies delete mode 100644 docker/etc/s6-overlay/s6-rc.d/04-nqptp/finish delete mode 100644 docker/etc/s6-overlay/s6-rc.d/04-nqptp/run delete mode 100644 docker/etc/s6-overlay/s6-rc.d/04-nqptp/type delete mode 100644 docker/etc/s6-overlay/s6-rc.d/user/contents.d/01-startup delete mode 100644 docker/etc/s6-overlay/s6-rc.d/user/contents.d/02-dbus delete mode 100644 docker/etc/s6-overlay/s6-rc.d/user/contents.d/03-avahi delete mode 100644 docker/etc/s6-overlay/s6-rc.d/user/contents.d/04-nqptp diff --git a/docker/etc/s6-overlay/s6-rc.d/01-startup/dependencies b/docker/etc/s6-overlay/s6-rc.d/01-startup/dependencies deleted file mode 100644 index df967b96..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/01-startup/dependencies +++ /dev/null @@ -1 +0,0 @@ -base 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 deleted file mode 100755 index 3037e98a..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/01-startup/script.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -echo "STARTING - $(date)" diff --git a/docker/etc/s6-overlay/s6-rc.d/01-startup/type b/docker/etc/s6-overlay/s6-rc.d/01-startup/type deleted file mode 100644 index bdd22a18..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/01-startup/type +++ /dev/null @@ -1 +0,0 @@ -oneshot diff --git a/docker/etc/s6-overlay/s6-rc.d/01-startup/up b/docker/etc/s6-overlay/s6-rc.d/01-startup/up deleted file mode 100644 index 0521bff8..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/01-startup/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/01-startup/script.sh diff --git a/docker/etc/s6-overlay/s6-rc.d/02-dbus/data/check b/docker/etc/s6-overlay/s6-rc.d/02-dbus/data/check deleted file mode 100755 index 39eeac11..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/02-dbus/data/check +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec dbus-send --system / org.freedesktop.DBus.Peer.Ping > /dev/null 2> /dev/null diff --git a/docker/etc/s6-overlay/s6-rc.d/02-dbus/dependencies b/docker/etc/s6-overlay/s6-rc.d/02-dbus/dependencies deleted file mode 100644 index f04b211f..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/02-dbus/dependencies +++ /dev/null @@ -1 +0,0 @@ -01-startup diff --git a/docker/etc/s6-overlay/s6-rc.d/02-dbus/finish b/docker/etc/s6-overlay/s6-rc.d/02-dbus/finish deleted file mode 100644 index e4a13866..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/02-dbus/finish +++ /dev/null @@ -1,2 +0,0 @@ -#!/command/execlineb -S0 -/run/s6/basedir/bin/halt diff --git a/docker/etc/s6-overlay/s6-rc.d/02-dbus/notification-fd b/docker/etc/s6-overlay/s6-rc.d/02-dbus/notification-fd deleted file mode 100644 index 00750edc..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/02-dbus/notification-fd +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/docker/etc/s6-overlay/s6-rc.d/02-dbus/run b/docker/etc/s6-overlay/s6-rc.d/02-dbus/run deleted file mode 100644 index f0e4aa50..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/02-dbus/run +++ /dev/null @@ -1,7 +0,0 @@ -#!/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/02-dbus/type b/docker/etc/s6-overlay/s6-rc.d/02-dbus/type deleted file mode 100644 index 5883cff0..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/02-dbus/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/docker/etc/s6-overlay/s6-rc.d/03-avahi/data/check b/docker/etc/s6-overlay/s6-rc.d/03-avahi/data/check deleted file mode 100755 index ccb833b6..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/03-avahi/data/check +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -state="$(dbus-send --system --dest=org.freedesktop.Avahi --print-reply / org.freedesktop.Avahi.Server.GetState | grep int32 | awk '{printf $2}')" - -# Avahi will return 'state=2' when 'Server startup complete' -if [ "$state" = 2 ]; then - exit 0 -else - exit 1 -fi - diff --git a/docker/etc/s6-overlay/s6-rc.d/03-avahi/dependencies b/docker/etc/s6-overlay/s6-rc.d/03-avahi/dependencies deleted file mode 100644 index 497f42ec..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/03-avahi/dependencies +++ /dev/null @@ -1 +0,0 @@ -02-dbus diff --git a/docker/etc/s6-overlay/s6-rc.d/03-avahi/finish b/docker/etc/s6-overlay/s6-rc.d/03-avahi/finish deleted file mode 100644 index e4a13866..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/03-avahi/finish +++ /dev/null @@ -1,2 +0,0 @@ -#!/command/execlineb -S0 -/run/s6/basedir/bin/halt diff --git a/docker/etc/s6-overlay/s6-rc.d/03-avahi/notification-fd b/docker/etc/s6-overlay/s6-rc.d/03-avahi/notification-fd deleted file mode 100644 index 00750edc..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/03-avahi/notification-fd +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/docker/etc/s6-overlay/s6-rc.d/03-avahi/run b/docker/etc/s6-overlay/s6-rc.d/03-avahi/run deleted file mode 100644 index edb5e74b..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/03-avahi/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/command/with-contenv sh -echo "Starting avahi" -exec s6-notifyoncheck avahi-daemon --no-chroot diff --git a/docker/etc/s6-overlay/s6-rc.d/03-avahi/type b/docker/etc/s6-overlay/s6-rc.d/03-avahi/type deleted file mode 100644 index 5883cff0..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/03-avahi/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/docker/etc/s6-overlay/s6-rc.d/04-nqptp/dependencies b/docker/etc/s6-overlay/s6-rc.d/04-nqptp/dependencies deleted file mode 100644 index f04b211f..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/04-nqptp/dependencies +++ /dev/null @@ -1 +0,0 @@ -01-startup diff --git a/docker/etc/s6-overlay/s6-rc.d/04-nqptp/finish b/docker/etc/s6-overlay/s6-rc.d/04-nqptp/finish deleted file mode 100644 index e4a13866..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/04-nqptp/finish +++ /dev/null @@ -1,2 +0,0 @@ -#!/command/execlineb -S0 -/run/s6/basedir/bin/halt diff --git a/docker/etc/s6-overlay/s6-rc.d/04-nqptp/run b/docker/etc/s6-overlay/s6-rc.d/04-nqptp/run deleted file mode 100644 index 27a489b8..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/04-nqptp/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/command/with-contenv sh -echo "Starting nqptp" -exec /usr/local/bin/nqptp diff --git a/docker/etc/s6-overlay/s6-rc.d/04-nqptp/type b/docker/etc/s6-overlay/s6-rc.d/04-nqptp/type deleted file mode 100644 index 5883cff0..00000000 --- a/docker/etc/s6-overlay/s6-rc.d/04-nqptp/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/docker/etc/s6-overlay/s6-rc.d/user/contents.d/01-startup b/docker/etc/s6-overlay/s6-rc.d/user/contents.d/01-startup deleted file mode 100644 index e69de29b..00000000 diff --git a/docker/etc/s6-overlay/s6-rc.d/user/contents.d/02-dbus b/docker/etc/s6-overlay/s6-rc.d/user/contents.d/02-dbus deleted file mode 100644 index e69de29b..00000000 diff --git a/docker/etc/s6-overlay/s6-rc.d/user/contents.d/03-avahi b/docker/etc/s6-overlay/s6-rc.d/user/contents.d/03-avahi deleted file mode 100644 index e69de29b..00000000 diff --git a/docker/etc/s6-overlay/s6-rc.d/user/contents.d/04-nqptp b/docker/etc/s6-overlay/s6-rc.d/user/contents.d/04-nqptp deleted file mode 100644 index e69de29b..00000000