Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🔨 Migrate old-style base scripts s6-rc #476

Merged
merged 1 commit into from
Dec 12, 2022
Merged

🔨 Migrate old-style base scripts s6-rc #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added ssh/rootfs/etc/s6-overlay/s6-rc.d/init-docker/dependencies.d/base
View file
Open in desktop
Empty file.
2 changes: 2 additions & 0 deletions ssh/rootfs/etc/cont-init.d/docker.sh → ...fs/etc/s6-overlay/s6-rc.d/init-docker/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/command/with-contenv bashio
# shellcheck shell=bash
# shellcheck disable=SC2207
# ==============================================================================
# Home Assistant Community Add-on: SSH & Web Terminal
# Enables Docker by moving the Docker executable in place.
Expand Down
1 change: 1 addition & 0 deletions ssh/rootfs/etc/s6-overlay/s6-rc.d/init-docker/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions ssh/rootfs/etc/s6-overlay/s6-rc.d/init-docker/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-docker/run
Empty file added ssh/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/dependencies.d/base
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions ssh/rootfs/etc/cont-init.d/mosquitto.sh → ...etc/s6-overlay/s6-rc.d/init-mosquitto/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/command/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Home Assistant Community Add-on: SSH & Web Terminal
# Pre-configures the Mosquitto clients, if the service is available
Expand Down
1 change: 1 addition & 0 deletions ssh/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions ssh/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-mosquitto/run
Empty file added ssh/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/dependencies.d/base
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions ssh/rootfs/etc/cont-init.d/mysql.sh → ...tfs/etc/s6-overlay/s6-rc.d/init-mysql/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/command/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Home Assistant Community Add-on: SSH & Web Terminal
# Pre-configures the MySQL clients, if the service is available
Expand Down
1 change: 1 addition & 0 deletions ssh/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions ssh/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-mysql/run
Empty file added ssh/rootfs/etc/s6-overlay/s6-rc.d/init-ssh/dependencies.d/base
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions ssh/rootfs/etc/cont-init.d/ssh.sh → ...ootfs/etc/s6-overlay/s6-rc.d/init-ssh/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/command/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Home Assistant Community Add-on: SSH & Web Terminal
# Configures the SSH daemon
Expand Down
1 change: 1 addition & 0 deletions ssh/rootfs/etc/s6-overlay/s6-rc.d/init-ssh/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions ssh/rootfs/etc/s6-overlay/s6-rc.d/init-ssh/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-ssh/run
Empty file added ssh/rootfs/etc/s6-overlay/s6-rc.d/init-user/dependencies.d/base
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions ssh/rootfs/etc/cont-init.d/user.sh → ...otfs/etc/s6-overlay/s6-rc.d/init-user/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/command/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Home Assistant Community Add-on: SSH & Web Terminal
# Executes configured customizations & persists user settings
Expand Down
1 change: 1 addition & 0 deletions ssh/rootfs/etc/s6-overlay/s6-rc.d/init-user/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions ssh/rootfs/etc/s6-overlay/s6-rc.d/init-user/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-user/run
Empty file added ssh/rootfs/etc/s6-overlay/s6-rc.d/sshd/dependencies.d/init-ssh
View file
Open in desktop
Empty file.
Empty file added ssh/rootfs/etc/s6-overlay/s6-rc.d/sshd/dependencies.d/init-user
View file
Open in desktop
Empty file.
27 changes: 27 additions & 0 deletions ssh/rootfs/etc/s6-overlay/s6-rc.d/sshd/finish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/command/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Home Assistant Community Add-on: SSH & Web Terminal
# Take down the S6 supervision tree when the SSH daemon fails
# ==============================================================================
declare exit_code
readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
readonly exit_code_service="${1}"
readonly exit_code_signal="${2}"
readonly service="SSH"

bashio::log.info \
"Service ${service} exited with code ${exit_code_service}" \
"(by signal ${exit_code_signal})"

if [[ "${exit_code_service}" -eq 256 ]]; then
if [[ "${exit_code_container}" -eq 0 ]]; then
echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
fi
[[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
elif [[ "${exit_code_service}" -ne 0 ]]; then
if [[ "${exit_code_container}" -eq 0 ]]; then
echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
fi
exec /run/s6/basedir/bin/halt
fi
1 change: 1 addition & 0 deletions ssh/rootfs/etc/services.d/sshd/run → ssh/rootfs/etc/s6-overlay/s6-rc.d/sshd/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/command/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Home Assistant Community Add-on: SSH & Web Terminal
# Starts the SSH service
Expand Down
1 change: 1 addition & 0 deletions ssh/rootfs/etc/s6-overlay/s6-rc.d/sshd/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
longrun
Empty file added ssh/rootfs/etc/s6-overlay/s6-rc.d/ttyd/dependencies.d/init-user
View file
Open in desktop
Empty file.
26 changes: 26 additions & 0 deletions ssh/rootfs/etc/s6-overlay/s6-rc.d/ttyd/finish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/command/with-contenv bashio
# ==============================================================================
# Home Assistant Community Add-on: SSH & Web Terminal
# Take down the S6 supervision tree when the ttyd daemon fails
# ==============================================================================
declare exit_code
readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
readonly exit_code_service="${1}"
readonly exit_code_signal="${2}"
readonly service="ttyd"

bashio::log.info \
"Service ${service} exited with code ${exit_code_service}" \
"(by signal ${exit_code_signal})"

if [[ "${exit_code_service}" -eq 256 ]]; then
if [[ "${exit_code_container}" -eq 0 ]]; then
echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
fi
[[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
elif [[ "${exit_code_service}" -ne 0 ]]; then
if [[ "${exit_code_container}" -eq 0 ]]; then
echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
fi
exec /run/s6/basedir/bin/halt
fi
1 change: 1 addition & 0 deletions ssh/rootfs/etc/services.d/ttyd/run → ssh/rootfs/etc/s6-overlay/s6-rc.d/ttyd/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/command/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Home Assistant Community Add-on: SSH & Web Terminal
# Runs the ttyd daemon
Expand Down
1 change: 1 addition & 0 deletions ssh/rootfs/etc/s6-overlay/s6-rc.d/ttyd/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
longrun
Empty file added ssh/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-docker
View file
Open in desktop
Empty file.
Empty file added ssh/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-mosquitto
View file
Open in desktop
Empty file.
Empty file added ssh/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-mysql
View file
Open in desktop
Empty file.
Empty file added ssh/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-ssh
View file
Open in desktop
Empty file.
Empty file added ssh/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-user
View file
Open in desktop
Empty file.
Empty file added ssh/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/sshd
View file
Open in desktop
Empty file.
Empty file added ssh/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/ttyd
View file
Open in desktop
Empty file.
11 changes: 0 additions & 11 deletions ssh/rootfs/etc/services.d/sshd/finish
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions ssh/rootfs/etc/services.d/ttyd/finish
View file
Open in desktop

This file was deleted.