From 28f2941c7781b494b9a47d71d56317b2ee8940d6 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Sun, 24 Aug 2008 23:37:51 +0000 Subject: [PATCH] Fix the vps output when a guest fails to stops nicely. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2772 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- m4/ensc_pathprog.m4 | 10 ++++++---- scripts/vserver.functions | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/m4/ensc_pathprog.m4 b/m4/ensc_pathprog.m4 index fc8521d..1678a74 100644 --- a/m4/ensc_pathprog.m4 +++ b/m4/ensc_pathprog.m4 @@ -29,7 +29,7 @@ AC_DEFUN([ENSC_PATHPROG_INIT], ]) -dnl Usage: ENSC_PATHPROG(, [, , ]) +dnl Usage: ENSC_PATHPROG(, [, , , ]) 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) diff --git a/scripts/vserver.functions b/scripts/vserver.functions index d5eeda5..1a73094 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -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 -- 1.8.1.5