From: Enrico Scholz Date: Fri, 25 Feb 2005 20:52:08 +0000 (+0000) Subject: avoid ambiguous usage of $PKGDIR, use $PKGINSTALLDIR instead of X-Git-Tag: IPSENTINEL_VERSION_0_12~129 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b841ac32fb251f6349b4ff18b5a1b7139313b95b;p=util-vserver.git avoid ambiguous usage of $PKGDIR, use $PKGINSTALLDIR instead of use $SETUP_CONFDIR instead of $confdir git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1865 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/vserver-build.functions.pkgmgmt b/util-vserver/scripts/vserver-build.functions.pkgmgmt index 4a3fba0..3932807 100644 --- a/util-vserver/scripts/vserver-build.functions.pkgmgmt +++ b/util-vserver/scripts/vserver-build.functions.pkgmgmt @@ -71,7 +71,7 @@ function pkgmgmt.initFilesystem test -z "$PKGCFGDIR" || { ln -s "$PKGCFGDIR" "$SETUP_CONFDIR/apps/pkgmgmt/base" - test "$_EXECDIR" = / || ln -s "$_EXECDIR" "$confdir/apps/pkgmgmt/execdir" + test "$_EXECDIR" = / || ln -s "$_EXECDIR" "$SETUP_CONFDIR/apps/pkgmgmt/execdir" } } @@ -79,5 +79,5 @@ function pkgmgmt.initFilesystem function pkgmgmt.initVariables { pkgmgmt._setPkgCfg - findDir PKGDIR "$CONFDIR/.distributions/$DISTRIBUTION/pkgs" "$DISTRIBDIR/$DISTRIBUTION/pkgs" / + findDir PKGINSTALLDIR "$CONFDIR/.distributions/$DISTRIBUTION/pkgs" "$DISTRIBDIR/$DISTRIBUTION/pkgs" / }