X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.functions.pkgmgmt;h=3460b97840398fbaf3bf8b1c9ce5b9cd50cb8b0b;hb=cc0e846b03b1250540445dd1f92083ee338898a2;hp=f57bdd0a03a002056f212edc10558188a791694e;hpb=e2e324637059ed62ee276753ecd573f93fc76dd3;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.functions.pkgmgmt b/util-vserver/scripts/vserver-build.functions.pkgmgmt index f57bdd0..3460b97 100644 --- a/util-vserver/scripts/vserver-build.functions.pkgmgmt +++ b/util-vserver/scripts/vserver-build.functions.pkgmgmt @@ -17,12 +17,13 @@ PKGCFGBASE= PKGCFGBASE_REL= +YUM_RELEASEPKGS=( {redhat,fedora}-release ) function pkgmgmt._setPkgCfgBase { test -z "$PKGCFGBASE" || return 0 - for item in "\"$CONFDIR/.defaults/apps/pkgmgmt/base\" 1" "$ROOTDIR/.pkg" "$DEFAULT_VSERVERPKGDIR"; do + for item in "\"$__CONFDIR/.defaults/apps/pkgmgmt/base\" 1" ${ROOTDIR:+"$ROOTDIR/.pkg"} "$__DEFAULT_VSERVERPKGDIR"; do eval set -- "$item" PKGCFGBASE=$1 PKGCFGBASE_REL=$2 @@ -30,7 +31,7 @@ function pkgmgmt._setPkgCfgBase done test -d "$PKGCFGBASE" || { - echo "pkgcfgbase-dir '$PKGCFGBASE' does not exists or is invalid" + echo "pkgcfgbase-dir '$PKGCFGBASE' does not exist or is invalid" >&2 exit 1 } } @@ -60,18 +61,21 @@ function pkgmgmt.initFilesystem { test -z "$1" || pkgmgmt._renameVserverPkgCfg test ! -d "$PKGCFGDIR" || { - echo $ + echo $\ "vserver pkgmgmt-directory exists already; please try to use -'--force'; or remove it manually" +'--force'; or remove it manually" >&2 exit 1 } - mkdir -p "$SETUP_CONFDIR"/apps/pkgmgmt + mkdir -p "$PKGCFGDIR" + base._addGeneratedFile "$PKGCFGDIR" + + mkdir -p "${SETUP_CONFDIR:?}"/apps/pkgmgmt 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 +83,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" / }