avoid ambiguous usage of $PKGDIR, use $PKGINSTALLDIR instead of
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Fri, 25 Feb 2005 20:52:08 +0000 (20:52 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Fri, 25 Feb 2005 20:52:08 +0000 (20:52 +0000)
use $SETUP_CONFDIR instead of $confdir

git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1865 94cd875c-1c1d-0410-91d2-eb244daf1a30

util-vserver/scripts/vserver-build.functions.pkgmgmt

index 4a3fba0..3932807 100644 (file)
@@ -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"     /
 }