minor optimizations
[util-vserver.git] / util-vserver / scripts / util-vserver-vars.pathsubst
index a449054..21a79f3 100644 (file)
@@ -8,30 +8,32 @@ PACKAGE_TARNAME='@PACKAGE_TARNAME@'
 PACKAGE_VERSION='@PACKAGE_VERSION@'
 
 CONFDIR='@CONFDIR@'
-DISTRIBDIR="$PKGLIBDIR/distributions"
 INCLUDEDIR='@INCLUDEDIR@'
 INITRDDIR='@INITRDDIR@'
 LEGACYDIR="@LEGACYDIR@"
 LIBDIR='@LIBDIR@'
-PKGLIBDEFAULTDIR="$PKGLIBDIR/defaults"
+LOCKDIR="/var/lock"
 PKGLIBDIR='@PKGLIBDIR@'
 PKGSTATEDIR="@PKGSTATEDIR@"
 PKGSTATEREVDIR="@PKGSTATEREVDIR@"
-RUNDIR="$PKGSTATEDIR"
 SBINDIR='@SBINDIR@'
 SYSCONFDIR='@SYSCONFDIR@'
 VSHELPERSTATEDIR="@VSHELPERSTATEDIR@"
 
+DISTRIBDIR="$PKGLIBDIR/distributions"
+PKGLIBDEFAULTDIR="$PKGLIBDIR/defaults"
+RUNDIR="$PKGSTATEDIR"
+
 DEFAULT_VSERVERDIR='@VSERVERDIR@'
 DEFAULT_VSERVERPKGDIR='@VSERVERPKGDIR@'
 
 _CAPCHROOT="$PKGLIBDIR/capchroot"
+_CHAINECHO="$PKGLIBDIR/chain-echo"
 _CHBIND="$SBINDIR/chbind"
 _CHCONTEXT="$SBINDIR/chcontext"
 _CHCONTEXT_COMPAT="$PKGLIBDIR/chcontext-compat"
 _CHROOT_CAT="$PKGLIBDIR/chroot-cat"
 _CHROOT_RM="$PKGLIBDIR/chroot-rm"
-_CLEARENV="$PKGLIBDIR/clearenv"
 _EXEC_CD="$SBINDIR/exec-cd"
 _EXEC_ULIMIT="$PKGLIBDIR/exec-ulimit"
 _FAKE_RUNLEVEL="$PKGLIBDIR/fakerunlevel"
@@ -46,6 +48,7 @@ _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"
 _LISTDEVIP="$LEGACYDIR/listdevip"
+_LOCKFILE="$PKGLIBDIR/lockfile"
 _MASK2PREFIX="$PKGLIBDIR/mask2prefix"
 _PARSERPMDUMP="$LEGACYDIR/parserpmdump"
 _PKGMGMT="$PKGLIBDIR/pkgmgmt"
@@ -78,21 +81,26 @@ _VSERVER_LEGACY="$LEGACYDIR/vserver"
 _VSERVER_BUILD="$PKGLIBDIR/vserver-build"
 _VSERVER_INFO="$SBINDIR/vserver-info"
 _VSERVERKILLALL="$LEGACYDIR/vserverkillall"
-_VSHELPER="$SBINDIR/vshelper"
+_VSHELPER="$PKGLIBDIR/vshelper"
 _VSHELPER_SYNC="$PKGLIBDIR/vshelper-sync"
 _VUNAME="$SBINDIR/vuname"
 _VUNIFY="$PKGLIBDIR/vunify"
 
 _AWK="@AWK@"
+_ENV="@ENV@"
 _GREP="@GREP@"
 _IP="@IP@"
+_IPTABLES="@IPTABLES@"
+_MODPROBE="@MODPROBE@"
 _MOUNT="@MOUNT@"
+_NAMEIF="@NAMEIF@"
 _NICE="@NICE@"
+_RMMOD="@RMMOD@"
+_TAR="@TAR@"
 _UMOUNT="@UMOUNT@"
 _VCONFIG="@VCONFIG@"
 _WC="@WC@"
 _WGET="@WGET@"
-_TAR="@TAR@"
 
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=106057
 WORKAROUND_106057=1