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=7475cc20c451e3c2525aceb6c56838e5c355f0ab;hpb=66ff8eb2e4f7e51fab7bf0eae4a756c9f54b7132;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.functions.pkgmgmt b/util-vserver/scripts/vserver-build.functions.pkgmgmt index 7475cc2..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 @@ -60,7 +60,7 @@ 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" >&2 exit 1