X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Futil-vserver-vars.pathsubst;h=b7479f368bc651d8a75bc66891d2cafe042bd22b;hb=dc3993a09b08889dc8f44164c9f3a378c2796e35;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..b7479f3 100644 --- a/util-vserver/scripts/util-vserver-vars.pathsubst +++ b/util-vserver/scripts/util-vserver-vars.pathsubst @@ -10,31 +10,50 @@ 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@" + +DEFAULT_VSERVERDIR='@VSERVERDIR@' +DEFAULT_VSERVERPKGDIR='@VSERVERPKGDIR@' _CAPCHROOT="$PKGLIBDIR/capchroot" _CHBIND="$SBINDIR/chbind" _CHCONTEXT="$SBINDIR/chcontext" +_CHROOT_CAT="$PKGLIBDIR/chroot-cat" _CHROOT_RM="$PKGLIBDIR/chroot-rm" -_CTX_KILL="$SBINDIR/ctx-kill" +_EXEC_CD="$SBINDIR/exec-cd" +_EXEC_ULIMIT="$PKGLIBDIR/exec-ulimit" _FAKE_RUNLEVEL="$PKGLIBDIR/fakerunlevel" _FILETIME="$PKGLIBDIR/filetime" _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" _MASK2PREFIX="$PKGLIBDIR/mask2prefix" _NEW_NAMESPACE="$SBINDIR/new-namespace" _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" _VAPT_GET="$SBINDIR/vapt-get" _VAPT_GET_WORKER="$PKGLIBDIR/vapt-get-worker" +_VKILL="$SBINDIR/vkill" _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" _AWK="@AWK@" _GREP="@GREP@" @@ -48,3 +67,7 @@ _WC="@WC@" # 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