X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fpkgmgmt;h=a641dfbddd652c3f40c0752fa751aa5aa156ced9;hb=95cf3519da76f335389cd7a18d0090b59f81f2e7;hp=1ab232abf36adb397ce0ef5b1149c89276192460;hpb=3d3c9e96f398fe4eddd4c73bcc50386ca8a8812e;p=util-vserver.git diff --git a/util-vserver/scripts/pkgmgmt b/util-vserver/scripts/pkgmgmt index 1ab232a..a641dfb 100755 --- a/util-vserver/scripts/pkgmgmt +++ b/util-vserver/scripts/pkgmgmt @@ -18,7 +18,7 @@ : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} test -e "$UTIL_VSERVER_VARS" || { - echo "Can not find util-vserver installation; aborting..." >&2 + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 exit 1 } . "$UTIL_VSERVER_VARS" @@ -132,15 +132,8 @@ function processVserver_RH() cfgdir=$($_VSERVER_INFO "$vserver" APPDIR)/pkgmgmt ## Figure out the environment.... - if test "$is_internalize"; then - have_apt=1 - test -d "$cfgdir"/base/apt -o -d "$cfgdir"/aptetc || have_apt= - else - have_apt= - for i in /bin /usr/bin /usr/local/bin; do - test ! -x "$vdir$i"/apt-get || { have_apt=1; break; } - done - fi + have_apt=1 + pkgmgmt.isAptAvailable "$cfgdir" "$vdir" "$is_internalize" || have_apt= local APTETCDIR= local APTSTATEDIR=