X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.functions.pkgmgmt;h=5f2649bb5fc45c8a0aafb563b26fd25d9ff64a0c;hb=95cf3519da76f335389cd7a18d0090b59f81f2e7;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..5f2649b 100644 --- a/util-vserver/scripts/vserver-build.functions.pkgmgmt +++ b/util-vserver/scripts/vserver-build.functions.pkgmgmt @@ -22,7 +22,7 @@ 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 +30,7 @@ function pkgmgmt._setPkgCfgBase done test -d "$PKGCFGBASE" || { - echo "pkgcfgbase-dir '$PKGCFGBASE' does not exists or is invalid" + echo "pkgcfgbase-dir '$PKGCFGBASE' does not exists or is invalid" >&2 exit 1 } } @@ -60,9 +60,9 @@ 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 }