X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Futil-vserver-vars.pathsubst;h=cda67a40610136eee4f496216978b55fecb066b7;hb=d45518897217889e8571d94d4459ee12c4db56a0;hp=0bfc6513a48d80bc1a44122bbd62a41901f5ad3f;hpb=64010b0431cfe40259ccf01aae7965f3845fc116;p=util-vserver.git diff --git a/util-vserver/scripts/util-vserver-vars.pathsubst b/util-vserver/scripts/util-vserver-vars.pathsubst index 0bfc651..cda67a4 100644 --- a/util-vserver/scripts/util-vserver-vars.pathsubst +++ b/util-vserver/scripts/util-vserver-vars.pathsubst @@ -10,31 +10,68 @@ PACKAGE_VERSION='@PACKAGE_VERSION@' PKGLIBDIR='@PKGLIBDIR@' SBINDIR='@SBINDIR@' CONFDIR='@CONFDIR@' +INITRDDIR='@INITRDDIR@' +LIBDIR='@LIBDIR@' +INCLUDEDIR='@INCLUDEDIR@' SYSCONFDIR='@SYSCONFDIR@' DISTRIBDIR="$PKGLIBDIR/distributions" +PKGSTATEDIR="@PKGSTATEDIR@" +PKGSTATEREVDIR="@PKGSTATEREVDIR@" +RUNDIR="$PKGSTATEDIR" +LEGACYDIR="@LEGACYDIR@" +PKGLIBDEFAULTDIR="$PKGLIBDIR/defaults" + +DEFAULT_VSERVERDIR='@VSERVERDIR@' +DEFAULT_VSERVERPKGDIR='@VSERVERPKGDIR@' _CAPCHROOT="$PKGLIBDIR/capchroot" _CHBIND="$SBINDIR/chbind" _CHCONTEXT="$SBINDIR/chcontext" +_CHCONTEXT_COMPAT="$PKGLIBDIR/chcontext-compat" +_CHROOT_CAT="$PKGLIBDIR/chroot-cat" _CHROOT_RM="$PKGLIBDIR/chroot-rm" -_CTX_KILL="$SBINDIR/ctx-kill" +_CLEARENV="$PKGLIBDIR/clearenv" +_EXEC_CD="$SBINDIR/exec-cd" +_EXEC_ULIMIT="$PKGLIBDIR/exec-ulimit" _FAKE_RUNLEVEL="$PKGLIBDIR/fakerunlevel" _FILETIME="$PKGLIBDIR/filetime" +_INITSYNC_MINIT_START=: +_INITSYNC_MINIT_STOP=: +_KEEP_CTX_ALIVE="$PKGLIBDIR/keep-ctx-alive" _LIB_FUNCTIONS="$PKGLIBDIR/functions" +_LIB_VSERVER_SETUP_FUNCTIONS="$PKGLIBDIR/vserver-setup.functions" +_LIB_VSERVER_BUILD_FUNCTIONS="$PKGLIBDIR/vserver-build.functions" +_LIB_VSERVER_BUILD_FUNCTIONS_APT="$PKGLIBDIR/vserver-build.functions.apt" +_LIB_VSERVER_BUILD_FUNCTIONS_RPM="$PKGLIBDIR/vserver-build.functions.rpm" +_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT="$PKGLIBDIR/vserver-build.functions.pkgmgmt" _MASK2PREFIX="$PKGLIBDIR/mask2prefix" -_NEW_NAMESPACE="$SBINDIR/new-namespace" +_PKGMGMT="$PKGLIBDIR/pkgmgmt" +_READLINK="$PKGLIBDIR/readlink" _RPM_FAKE_SO="$PKGLIBDIR/rpm-fake.so" -_SAVE_S_CONTEXT="$PKGLIBDIR/save_s_context" +_SAVE_S_CONTEXT="$LEGACYDIR/save_s_context" _SAVE_CTXINFO="$PKGLIBDIR/save_ctxinfo" _SECURE_MOUNT="$PKGLIBDIR/secure-mount" -_SECURE_UMOUNT="$PKGLIBDIR/secure-umount" +_SETATTR="$SBINDIR/setattr" +_START_VSERVERS="$PKGLIBDIR/start-vservers" _VAPT_GET="$SBINDIR/vapt-get" _VAPT_GET_WORKER="$PKGLIBDIR/vapt-get-worker" +_VATTRIBUTE="$SBINDIR/vattribute" +_VCONTEXT="$SBINDIR/vcontext" +_VKILL="$SBINDIR/vkill" +_VLIMIT="$SBINDIR/vlimit" +_VNAMESPACE="$SBINDIR/vnamespace" +_VPKG="$PKGLIBDIR/vpkg" +_VPROCUNHIDE="$PKGLIBDIR/vprocunhide" _VPS="$SBINDIR/vps" _VRPM="$SBINDIR/vrpm" _VRPM_PRELOAD="$PKGLIBDIR/vrpm-preload" _VRPM_WORKER="$PKGLIBDIR/vrpm-worker" -_VSERVER_LEGACY="$PKGLIBDIR/vserver-legacy" +_VSERVER="$SBINDIR/vserver" +_VSERVER_LEGACY="$LEGACYDIR/vserver" +_VSERVER_BUILD="$PKGLIBDIR/vserver-build" +_VSERVER_INFO="$SBINDIR/vserver-info" +_VUNAME="$SBINDIR/vuname" +_VUNIFY="$PKGLIBDIR/vunify" _AWK="@AWK@" _GREP="@GREP@" @@ -44,7 +81,12 @@ _NICE="@NICE@" _UMOUNT="@UMOUNT@" _VCONFIG="@VCONFIG@" _WC="@WC@" - +_WGET="@WGET@" +_TAR="@TAR@" # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=106057 WORKAROUND_106057=1 +# /var/lib/rpm is hardcoded into apt-get which does not honor the +# %_dbpath variable therefore +# http://distro2.conectiva.com.br/pipermail/apt-rpm/2003-October/001985.html +WORKAROUND_APT_DBPATH=1