From cc92744c284b44460d8426886abaab82efb07c2d Mon Sep 17 00:00:00 2001 From: Jocelyn Le Sage Date: Thu, 15 Jun 2017 13:18:09 -0400 Subject: [PATCH] Adjusted prefix of service related messages. --- rootfs/etc/services.d/guiapp/run | 4 ++-- rootfs/etc/services.d/openbox/run | 4 ++-- rootfs/etc/services.d/x11vnc/run | 4 ++-- rootfs/etc/services.d/xvfb/run | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rootfs/etc/services.d/guiapp/run b/rootfs/etc/services.d/guiapp/run index 97244ce..f8721d3 100755 --- a/rootfs/etc/services.d/guiapp/run +++ b/rootfs/etc/services.d/guiapp/run @@ -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 diff --git a/rootfs/etc/services.d/openbox/run b/rootfs/etc/services.d/openbox/run index 4409ad9..4588382 100755 --- a/rootfs/etc/services.d/openbox/run +++ b/rootfs/etc/services.d/openbox/run @@ -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 : diff --git a/rootfs/etc/services.d/x11vnc/run b/rootfs/etc/services.d/x11vnc/run index b410c38..9bd27ff 100755 --- a/rootfs/etc/services.d/x11vnc/run +++ b/rootfs/etc/services.d/x11vnc/run @@ -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 @@ -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 \ diff --git a/rootfs/etc/services.d/xvfb/run b/rootfs/etc/services.d/xvfb/run index 44a7a7a..5a1661a 100755 --- a/rootfs/etc/services.d/xvfb/run +++ b/rootfs/etc/services.d/xvfb/run @@ -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 :