Fix the vps output when a guest fails to stops nicely.
authorDaniel Hokka Zakrisson <daniel@hozac.com>
Sun, 24 Aug 2008 23:37:51 +0000 (23:37 +0000)
committerDaniel Hokka Zakrisson <daniel@hozac.com>
Sun, 24 Aug 2008 23:37:51 +0000 (23:37 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2772 94cd875c-1c1d-0410-91d2-eb244daf1a30

m4/ensc_pathprog.m4
scripts/vserver.functions

index fc8521d..1678a74 100644 (file)
@@ -29,7 +29,7 @@ AC_DEFUN([ENSC_PATHPROG_INIT],
 ])
 
 
-dnl Usage: ENSC_PATHPROG(<VAR>, <PROG>[, <DFLT>, <DESCR>])
+dnl Usage: ENSC_PATHPROG(<VAR>, <PROG>[, <DFLT>, <DESCR>, <DEREF>])
 AC_DEFUN([ENSC_PATHPROG],
 [
        AC_REQUIRE([ENSC_SET_SEARCHPATH])
@@ -59,8 +59,10 @@ $4])
                fi
        fi
 
-       if test -e "${$1}"; then
-               $1=`readlink -f "${$1}"`
+       if test "x$5" = x; then
+               if test -h "${$1}"; then
+                       $1=`readlink -f "${$1}"`
+               fi
        fi
 
        test "${$1}" && ENSC_PATHPROG_SED="${ENSC_PATHPROG_SED}s!@'$1'@!${$1}!g;"
@@ -78,7 +80,7 @@ AC_DEFUN([ENSC_PATHPROG_STANDARD_TOOLS],
        ENSC_PATHPROG(CMP,       cmp)
        ENSC_PATHPROG(CP,        cp)
        ENSC_PATHPROG(DIRNAME,   dirname)
-       ENSC_PATHPROG(EGREP,     egrep)
+       ENSC_PATHPROG(EGREP,     egrep, [], [], no-deref)
        ENSC_PATHPROG(ENV,       env)
        ENSC_PATHPROG(GREP,      grep)
        ENSC_PATHPROG(LN,        ln)
index d5eeda5..1a73094 100644 (file)
@@ -1037,7 +1037,7 @@ function initWait
            rc=$?
 
            if test "$rc" -ne 0 -a "$rc" -ne 1; then
-               $_VPS axf | $_EGREP -e "^[^ \t]+[ \t]+$S_CONTEXT[ \t]+" >&4
+               $_VPS axf | $_EGREP -e "^[ \t]*[^ \t]+[ \t]+$S_CONTEXT[ \t]+" >&4
                killContext "$S_CONTEXT" 9
            fi