X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-build.yum;h=23fe4368e1e3e28a43b4c691f569e646c7ef7e81;hb=909fa999c0180aba479959080bd434ad98930c49;hp=4ae697ba25b2cc1c8b99f47bb129224fb6fd1c81;hpb=64e374135d24a1624561c814ad3e650ffbd5ee74;p=util-vserver.git diff --git a/scripts/vserver-build.yum b/scripts/vserver-build.yum index 4ae697b..23fe436 100644 --- a/scripts/vserver-build.yum +++ b/scripts/vserver-build.yum @@ -63,8 +63,9 @@ if $_VSERVER_INFO - FEATURE persistent; then $_VATTRIBUTE --set --xid self --secure --flag persistent -- \ $_VCONTEXT --xid self --migrate-self --endsetup -- \ /bin/true - RPM_FAKE_CTX=`cat $SETUP_CONFDIR/run` + RPM_FAKE_CTX=`$_CAT $SETUP_CONFDIR/run` export RPM_FAKE_CTX + base._addGeneratedFile "`$_READLINK $SETUP_CONFDIR/run`" base.pushCleanup $_VATTRIBUTE --xid "$RPM_FAKE_CTX" --flag '!persistent' fi @@ -74,6 +75,9 @@ rpm.importGPGPubKeys "$SETUP_CONFDIR" \ "$__CONFDIR/.distributions/.common/pubkeys" \ "$__DISTRIBDIR/$DISTRIBUTION/pubkeys" yum.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR" + +test -z "$1" || $_VYUM "$SETUP_CONFDIR" -- -y install "$@" + $_VYUM "$SETUP_CONFDIR" -- clean all if $_VSERVER_INFO - FEATURE persistent; then