- upstart_native branch merged

svn-id: @11419

diff --cc service
index 7e210ee2b84abdd404ac8355b3a93c1633bbd744,4a4355cfe5de95e272d466b42d578d73dd3f88ab..7112460bf4c85e2ca294e549c20992cef1350432
--- 1/service
--- 2/service
+++ b/service
@@@ -44,35 -33,27 +45,43 @@@ while [ $# -gt 0 ]; d
                echo "${VERSION}" >&2
                exit 0
                ;;
-       *)
+         --upstart)
+               USE_UPSTART=yes
+               shift
+               ;;
+         --no-upstart)
+               USE_UPSTART=no
+               shift
+               ;;
+         *)
                if [ -z "${SERVICE}" -a $# -eq 1 -a "${1}" = "--status-all" ]; then
                        cd ${SERVICEDIR}
 -                      for SERVICE in * ; do
 +                      for SERVICE in *; do
                                case "${SERVICE}" in
 -                                functions | halt | killall | single| linuxconf| kudzu | \
 -                                *rpmorig | *rpmnew | *rpmsave | *~ | *.orig)
 +                              functions | halt | killall | single| linuxconf| kudzu)
                                        ;;
 -                                *)
 -                                      if [ -x "${SERVICEDIR}/${SERVICE}" ]; then
 -                                              env -i USE_UPSTART=$USE_UPSTART LANG=$LANG PATH=$PATH TERM=$TERM "${SERVICEDIR}/${SERVICE}" status
 +                              *)
 +                              if ! is_ignored_file "${SERVICE}" \
 +                                              && [ -x "${SERVICEDIR}/${SERVICE}" ]; then
 +                                      if ! grep -qs "\Wstatus)" "$SERVICE"; then
 +                                              #printf " %s %-60s %s\n" "[?]" "$SERVICE:" "unknown" 1>&2
 +                                              echo " [ ? ]  $SERVICE" 1>&2
 +                                              continue
 +                                      else
-                                               out=$(env -i LANG="$LANG" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status 2>&1)
++                                              out=$(env -i USE_UPSTART=$USE_UPSTART LANG="$LANG" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status 2>&1)
 +                                              if [ "$?" = "0" -a -n "$out" ]; then
 +                                                      #printf " %s %-60s %s\n" "[+]" "$SERVICE:" "running"
 +                                                      echo " [ + ]  $SERVICE"
 +                                                      continue
 +                                              else
 +                                                      #printf " %s %-60s %s\n" "[-]" "$SERVICE:" "NOT running"
 +                                                      echo " [ - ]  $SERVICE"
 +                                                      continue
 +                                              fi
                                        fi
 -                                      ;;
 +                                      #env -i LANG="$LANG" PATH="$PATH" TERM="$TERM" "$SERVICEDIR/$SERVICE" status
 +                              fi
 +                              ;;
                                esac
                        done
                        exit 0
@@@ -96,7 -75,7 +105,7 @@@
  done
  
  if [ -x "${SERVICEDIR}/${SERVICE}" ]; then
-       exec env -i LANG=$LANG PATH=$PATH TERM=$TERM "${SERVICEDIR}/${SERVICE}" ${ACTION} ${OPTIONS}
 -      env -i USE_UPSTART=$USE_UPSTART LANG=$LANG PATH=$PATH TERM=$TERM "${SERVICEDIR}/${SERVICE}" ${OPTIONS}
++      exec env -i USE_UPSTART=$USE_UPSTART LANG=$LANG PATH=$PATH TERM=$TERM "${SERVICEDIR}/${SERVICE}" ${ACTION} ${OPTIONS}
  else
        echo "${SERVICE}: unrecognized service" >&2
        exit 1