From ab4b2dd361f2086da8ec0ae99ef4bf79dd7265d9 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Wed, 31 Mar 2010 13:53:16 +0000 Subject: [PATCH 1/1] Check for find in configure since it may be a symlink. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2883 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- configure.ac | 1 + scripts/util-vserver-vars.pathsubst | 1 + scripts/vserver.functions | 9 +++++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 32d1e83..e0824e0 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,7 @@ ENSC_PATHPROG(RESTORE, restore, [restore]) ENSC_PATHPROG(RSYNC, rsync, [rsync]) ENSC_PATHPROG(STRACE, strace, [strace]) ENSC_PATHPROG(FSCK, fsck) +ENSC_PATHPROG(FIND, find) ENSC_PATHPROG(DOXYGEN, doxygen, [:]) ENSC_PATHPROG(XSLTP, xsltp, [:]) diff --git a/scripts/util-vserver-vars.pathsubst b/scripts/util-vserver-vars.pathsubst index ae8e0e0..c867ac7 100644 --- a/scripts/util-vserver-vars.pathsubst +++ b/scripts/util-vserver-vars.pathsubst @@ -121,6 +121,7 @@ _DIRNAME="@DIRNAME@" _EGREP="@EGREP@" _ENV="@ENV@" _FILE="@FILE@" +_FIND="@FIND@" _FSCK="@FSCK@" _GREP="@GREP@" _GZIP="@GZIP@" diff --git a/scripts/vserver.functions b/scripts/vserver.functions index b014abf..f8c78b6 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -344,7 +344,8 @@ function _generateInitOptions panic "init-vserver.sh not found; aborting" fi - INITCMD_START=( env TERM=$TERM $RC_WRAP "$RUNLEVEL_START" ) + OPTS_ENV=( "${OPTS_ENV[@]}" TERM=$TERM ) + INITCMD_START=( $RC_WRAP "$RUNLEVEL_START" ) INITCMD_STOP=( env -i PATH=$RC_PATH TERM=$TERM RUNLEVEL=0 /sbin/rc shutdown ) INITCMD_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmp ) ;; @@ -808,8 +809,8 @@ function prepareInit pushd "$1/vdir" >/dev/null case "$INITSTYLE" in sysv) - { find var/run ! -type d -print0; \ - find var/lock ! -type d -print0; } | xargs -0r $_CHROOT_SH rm + { $_FIND var/run ! -type d -print0; \ + $_FIND var/lock ! -type d -print0; } | xargs -0r $_CHROOT_SH rm ;; plain) $_CHROOT_SH rm .autofsck forcefsck 2>/dev/null || : @@ -1217,7 +1218,7 @@ WARNING: There is no cachedirectory configured for this vserver; ln -s ../.defaults/cachebase/$VSERVER_NAME $cfgdir/cache " - find "$cfgdir" -type f -exec "$_CHECK_UNIXFILE" '{}' ';' + $_FIND "$cfgdir" -type f -exec "$_CHECK_UNIXFILE" '{}' ';' vshelper.doSanityCheck -- 1.8.1.5