From: Enrico Scholz Date: Tue, 11 Sep 2007 21:26:41 +0000 (+0000) Subject: added support for yum's new persistdir option X-Git-Tag: release-0.30.215~94 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c2ad8b4dbb0dd4f2366a73d5f406d410d0147ba;p=util-vserver.git added support for yum's new persistdir option git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2612 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/distrib/f7/yum/yum.conf b/distrib/f7/yum/yum.conf index 1d21cd1..cd0ccc9 100644 --- a/distrib/f7/yum/yum.conf +++ b/distrib/f7/yum/yum.conf @@ -1,5 +1,6 @@ [main] cachedir=@YUMCACHEDIR@ +persistdir=@YUMLIBDIR@ reposdir=@YUMETCDIR@/yum.repos.d debuglevel=1 logfile=@YUMLOGDIR@/log diff --git a/scripts/vserver-build.functions.yum b/scripts/vserver-build.functions.yum index 1006687..236f7c2 100644 --- a/scripts/vserver-build.functions.yum +++ b/scripts/vserver-build.functions.yum @@ -56,6 +56,7 @@ function yum.__substituteConf if test -e "$f"; then $_SED -e "s!@YUMETCDIR@!$prefix$PKGCFGDIR/yum/etc!g; s!@YUMCACHEDIR@!$prefix$PKGCFGDIR/yum/cache!g; + s!@YUMLIBDIR@!$prefix$PKGCFGDIR/yum/lib!g; s!@YUMLOGDIR@!$prefix$PKGCFGDIR/yum!g; s!@YUMLOCKDIR@!$prefix$PKGCFGDIR/yum!g; " "$f" >"$f.tmp" @@ -66,7 +67,7 @@ function yum.__substituteConf function yum.initFilesystem { - mkdir -p "$PKGCFGDIR"/yum/{etc,cache} + mkdir -p "$PKGCFGDIR"/yum/{etc,cache,lib} populateDirectory "$PKGCFGDIR/yum/etc" \ "$__DISTRIBDIR/defaults/yum" \