fix message printing; pass anything to systemd if it is up (status is valid action...

[projects/rc-scripts.git] / service

diff --git a/service b/service
index c3cbaca4a16d6617a20373cce2fe27b512f50c9c..3c3071caed0934069fd6f97c9932915a6801b90d 100755 (executable)
--- a/service
+++ b/service
@@ -85,14 +85,14 @@ while [ $# -gt 0 ]; do
                echo "${VERSION}" >&2
                exit 0
                ;;
-    --ignore-dependencies)
-       export SYSTEMCTL_IGNORE_DEPENDENCIES=1
-       shift
-       ;;
-    --skip-redirect)
-       export SYSTEMCTL_SKIP_REDIRECT=1
-       shift
-       ;;
+       --ignore-dependencies)
+               export SYSTEMCTL_IGNORE_DEPENDENCIES=1
+               shift
+               ;;
+       --skip-redirect)
+               export SYSTEMCTL_SKIP_REDIRECT=1
+               shift
+               ;;
        --upstart)
                USE_UPSTART=yes
                shift
@@ -124,8 +124,8 @@ while [ $# -gt 0 ]; do
        esac
 done
 
-if [ -x /bin/systemd_booted ] && /bin/systemd_booted && /bin/systemctl status ${SERVICE}.service > /dev/null 2>&1; then
-       echo >&2 "Redirecting to /bin/systemctl ${OPTIONS} ${SERVICE}.service"
+if [ -x /bin/systemd_booted ] && /bin/systemd_booted; then
+       echo >&2 "Redirecting to /bin/systemctl ${ACTION} ${SERVICE}.service ${OPTIONS}"
        exec /bin/systemctl ${ACTION} ${SERVICE}.service ${OPTIONS}
 elif [ -x "${SERVICEDIR}/${SERVICE}" ]; then
        exec env -i USE_UPSTART=$USE_UPSTART LANG=$LANG PATH=$PATH TERM=$TERM "${SERVICEDIR}/${SERVICE}" ${ACTION} ${OPTIONS}