Skip to content

Commit

Permalink
Fix for s6 v3
Browse files Browse the repository at this point in the history
  • Loading branch information
alexyao2015 committed Feb 24, 2022
1 parent 9828437 commit 9c8353d
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion root/etc/cont-init.d/100-es-config.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash
. "/usr/local/bin/logger"
program_name="es-config"

Expand Down
2 changes: 1 addition & 1 deletion root/etc/cont-init.d/105-es-certificate-gen.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash
. "/usr/local/bin/logger"
program_name="es-certificate-gen"

Expand Down
2 changes: 1 addition & 1 deletion root/etc/mariadbconfigure.d/20-es-config.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash
. "/usr/local/bin/logger"
# ==============================================================================
# es-config
Expand Down
2 changes: 1 addition & 1 deletion root/etc/services.d/zmeventnotification/finish
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash
. "/usr/local/bin/logger"
# ==============================================================================
# ZM Event Notification Server
Expand Down
2 changes: 1 addition & 1 deletion root/etc/services.d/zmeventnotification/log/run
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash
program_name="zmeventnotification-service"

s6-format-filter "%1 %s" "[${program_name}]" | logutil-service /log/"${program_name}"
4 changes: 2 additions & 2 deletions root/etc/services.d/zmeventnotification/run
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash
. "/usr/local/bin/logger"
# ==============================================================================
# ZM Event Notification Server
Expand All @@ -13,7 +13,7 @@ if [ "${ES_DEBUG_ENABLED}" -eq 1 ]; then
fi

echo "Waiting for ZoneMinder to start" | info
/bin/s6-svwait -U /var/run/s6/services/zoneminder
s6-svwait -U /run/service/zoneminder

echo "Starting Event Server..." | info
fdmove -c 1 3 \
Expand Down

0 comments on commit 9c8353d

Please sign in to comment.