X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvrpm;h=2a2094320646c12afc7143f01ba32d4d78288dda;hb=c574f33e210c3438945209d685c218c51f74cbaa;hp=35311e0374f72b9b45b68c2e05dcefa8b7a48ded;hpb=bbe9a9f735bc09bdd6ac46ec23f82506dc589432;p=util-vserver.git diff --git a/util-vserver/scripts/vrpm b/util-vserver/scripts/vrpm index 35311e0..2a20943 100755 --- a/util-vserver/scripts/vrpm +++ b/util-vserver/scripts/vrpm @@ -16,9 +16,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -: ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars} +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} test -e "$UTIL_VSERVER_VARS" || { - echo "Can not find util-vserver installation; aborting..." + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 exit 1 } . "$UTIL_VSERVER_VARS" @@ -26,29 +26,35 @@ test -e "$UTIL_VSERVER_VARS" || { function showHelp() { - echo "Usage: $0 * [--all] [--help] [--version] [--unify] -- +" + echo \ +$"Usage: $0 * [--all] [--help] [--version] [--unify] -- + + +Report bugs to <$PACKAGE_BUGREPORT>." + exit $1 } function showVersion() { - cat <&2 cnt=0 res=255 -for i in $vservers; do +for i in "${vservers[@]}"; do cnt=$[ cnt + 1 ] - "$_NEW_NAMESPACE" "$_VRPM_WORKER" "$i" "$@" + + if pkgmgmt.isInternal "$i"; then + $_VSERVER "$i" exec rpm "$@" + else + callInNamespace "$i" \ + "$_VNAMESPACE" --new -- "$_VRPM_WORKER" "$i" "$@" + fi + res=$? done