Skip to content

Commit

Permalink
Adjusted prefix of service related messages.
Browse files Browse the repository at this point in the history
  • Loading branch information
jlesage committed Jun 15, 2017
1 parent aa26566 commit cc92744
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions rootfs/etc/services.d/guiapp/run
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ set -u # Treat unset variables as an error.
# Make sure openbox is running.
while ! s6-svrunning /var/run/s6/services/openbox 1
do
echo "[service.d] guiapp: waiting for openbox to be ready..."
echo "[services.d] guiapp: waiting for openbox to be ready..."
sleep 2
done

echo "[service.d] guiapp: starting "${APP_NAME:-X application}"..."
echo "[services.d] guiapp: starting "${APP_NAME:-X application}"..."
if [ -e /startapp.sh ]; then
exec 2>&1 $APP_NICE_CMD s6-setuidgid $USER_ID:$GROUP_ID /startapp.sh
else
Expand Down
4 changes: 2 additions & 2 deletions rootfs/etc/services.d/openbox/run
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ set -u # Treat unset variables as an error.
# Make sure xvfb is running.
while ! s6-svrunning /var/run/s6/services/xvfb 1
do
echo "[service.d] openbox: waiting for xvfb to be ready..."
echo "[services.d] openbox: waiting for xvfb to be ready..."
sleep 2
done

echo "[service.d] openbox: starting..."
echo "[services.d] openbox: starting..."
exec 2>&1 s6-setuidgid $USER_ID:$GROUP_ID /usr/bin/openbox-session

# vim: set ft=sh :
4 changes: 2 additions & 2 deletions rootfs/etc/services.d/x11vnc/run
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -u # Treat unset variables as an error.
# Make sure xvfb is running.
while ! s6-svrunning /var/run/s6/services/xvfb 1
do
echo "[service.d] x11vnc: waiting for xvfb to be ready..."
echo "[services.d] x11vnc: waiting for xvfb to be ready..."
sleep 2
done

Expand All @@ -23,7 +23,7 @@ else
IPV6="-rfbportv6 -1 -no6 -noipv6 -httpportv6 -1"
fi

echo "[service.d] x11vnc: starting..."
echo "[services.d] x11vnc: starting..."
exec 2>&1 /usr/bin/x11vnc \
-display $DISPLAY \
-rfbport 5900 \
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/services.d/xvfb/run
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -u # Treat unset variables as an error.

echo "[service.d] xvfb: starting..."
echo "[services.d] xvfb: starting..."
exec 2>&1 /usr/bin/Xvfb $DISPLAY -screen 0 ${DISPLAY_WIDTH}x${DISPLAY_HEIGHT}x24

# vim: set ft=sh :

0 comments on commit cc92744

Please sign in to comment.