Skip to content

Commit 62a87c4

Browse files
authored
Merge pull request #27 from linuxserver/trixie-custom-files-x
2 parents eafa69f + 617807f commit 62a87c4

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN \
2727
/root-out/var/log/*
2828

2929
# set version for s6 overlay
30-
ARG S6_OVERLAY_VERSION="3.2.0.2"
30+
ARG S6_OVERLAY_VERSION="3.2.1.0"
3131
ARG S6_OVERLAY_ARCH="x86_64"
3232

3333
# add s6 overlay

Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN \
2727
/root-out/var/log/*
2828

2929
# set version for s6 overlay
30-
ARG S6_OVERLAY_VERSION="3.2.0.2"
30+
ARG S6_OVERLAY_VERSION="3.2.1.0"
3131
ARG S6_OVERLAY_ARCH="aarch64"
3232

3333
# add s6 overlay

root/etc/s6-overlay/s6-rc.d/init-custom-files/run

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ if [[ -e "${SCRIPTS_DIR}" ]] && [[ -n "$(/bin/ls -A ${SCRIPTS_DIR} 2>/dev/null)"
99
echo "[custom-init] Files found, executing"
1010
for SCRIPT in "${SCRIPTS_DIR}"/*; do
1111
NAME="$(basename "${SCRIPT}")"
12-
if [[ -f "${SCRIPT}" ]]; then
12+
if [[ -x "${SCRIPT}" ]]; then
1313
echo "[custom-init] ${NAME}: executing..."
1414
/bin/bash "${SCRIPT}"
1515
echo "[custom-init] ${NAME}: exited $?"
16-
elif [[ ! -f "${SCRIPT}" ]]; then
17-
echo "[custom-init] ${NAME}: is not a file"
16+
elif [[ ! -x "${SCRIPT}" ]]; then
17+
echo "[custom-init] ${NAME}: is not an executable file"
1818
fi
1919
done
2020
else

0 commit comments

Comments
 (0)