Changeset 2772
- Timestamp:
- 08/25/08 01:37:51 (3 months ago)
- Files:
-
- trunk/m4/ensc_pathprog.m4 (modified) (3 diffs)
- trunk/scripts/vserver.functions (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/m4/ensc_pathprog.m4
r2504 r2772 30 30 31 31 32 dnl Usage: ENSC_PATHPROG(<VAR>, <PROG>[, <DFLT>, <DESCR> ])32 dnl Usage: ENSC_PATHPROG(<VAR>, <PROG>[, <DFLT>, <DESCR>, <DEREF>]) 33 33 AC_DEFUN([ENSC_PATHPROG], 34 34 [ … … 60 60 fi 61 61 62 if test -e "${$1}"; then 63 $1=`readlink -f "${$1}"` 62 if test "x$5" = x; then 63 if test -h "${$1}"; then 64 $1=`readlink -f "${$1}"` 65 fi 64 66 fi 65 67 … … 79 81 ENSC_PATHPROG(CP, cp) 80 82 ENSC_PATHPROG(DIRNAME, dirname) 81 ENSC_PATHPROG(EGREP, egrep )83 ENSC_PATHPROG(EGREP, egrep, [], [], no-deref) 82 84 ENSC_PATHPROG(ENV, env) 83 85 ENSC_PATHPROG(GREP, grep) trunk/scripts/vserver.functions
r2771 r2772 1038 1038 1039 1039 if test "$rc" -ne 0 -a "$rc" -ne 1; then 1040 $_VPS axf | $_EGREP -e "^[ ^ \t]+[ \t]+$S_CONTEXT[ \t]+" >&41040 $_VPS axf | $_EGREP -e "^[ \t]*[^ \t]+[ \t]+$S_CONTEXT[ \t]+" >&4 1041 1041 killContext "$S_CONTEXT" 9 1042 1042 fi
