X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvpkg;h=153fe55d254ec943be79891731a9a6c7a8915778;hb=dc80079d18e35917dfea24f821faddcbc016e80f;hp=734317123f372ec693433fe3f07541887b31697e;hpb=2f3db8129f80e01fbaaa8f9defbddd7e59222a0b;p=util-vserver.git diff --git a/util-vserver/scripts/vpkg b/util-vserver/scripts/vpkg index 7343171..153fe55 100755 --- a/util-vserver/scripts/vpkg +++ b/util-vserver/scripts/vpkg @@ -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..." + echo "Can not find util-vserver installation; aborting..." >&2 exit 1 } . "$UTIL_VSERVER_VARS" @@ -81,11 +81,7 @@ case "$tag" in *) echo $"Unsupport tag '$tag'" >&2; exit 1;; esac -cfgdir=$($_VSERVER_INFO "$vserver" APPDIR pkgmgmt) || { - echo $"Package management not configured for vserver '$vserver'" >&2 - exit 1 -} - +cfgdir=$($_VSERVER_INFO "$vserver" APPDIR pkgmgmt) || : vdir=$($_VSERVER_INFO "$1" VDIR) || : style= @@ -93,7 +89,7 @@ is_external= { read style <"$cfgdir"/style; } 2>/dev/null test "$style" || guessStyle "$vserver" -test -e "$cfgdir"/internal || is_external=1 +test ! -d "$cfgdir" -o -e "$cfgdir"/internal || is_external=1 cmd=() @@ -138,7 +134,21 @@ case "$style" in fi ;; (debian) - exit 1 + case "$tag" in + (get-conffiles) + cmd=( sh -c "cat /var/lib/dpkg/info/*.conffiles 2>/dev/null" ) + ;; + (install) + cmd=( apt-get install "$@" ) + ;; + esac + + if test "$is_external"; then + echo $"'external' packagemanagement is not supported for Debian" >&2 + exit 1 + else + cmd=( "$_VSERVER" --silent "$vserver" exec "${cmd[@]}" ) + fi ;; esac