From 0d832092a539e60bd85c84c9e7c4a56ab3a96e95 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Tue, 2 Jun 2026 22:09:21 +1000 Subject: [PATCH 1/2] Only modify files in startup when they aren't mounted --- docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh b/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh index edc9649c9b..36387a98dc 100755 --- a/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh +++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh @@ -8,6 +8,10 @@ set -e log_info 'IPv6 ...' +is_mounted() { + awk -v p="$1" '$5 == p { found=1 } END { exit !found }' /proc/self/mountinfo +} + process_folder () { FILES=$(find "$1" -type f -name "*.conf") SED_REGEX= @@ -26,7 +30,10 @@ process_folder () { do echo "- ${FILE}" TMPFILE="${FILE}.tmp" - if sed -E "$SED_REGEX" "$FILE" > "$TMPFILE" && [ -s "$TMPFILE" ]; then + + if is_mounted "${FILE}"; then + echo "WARNING: skipping ${FILE} — mounted file" >&2 + elif sed -E "$SED_REGEX" "$FILE" > "$TMPFILE" && [ -s "$TMPFILE" ]; then mv "$TMPFILE" "$FILE" else echo "WARNING: skipping ${FILE} — sed produced empty output" >&2 From af2de98c411c85bf741ffdffc335f4fc8dd1df38 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Wed, 3 Jun 2026 08:22:27 +1000 Subject: [PATCH 2/2] Bump version --- .version | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.version b/.version index 68e69e405e..3b1fc7950f 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.15.0 +2.15.1 diff --git a/README.md b/README.md index 0af3edecd8..5cd9be1c96 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@



- +