X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?p=util-vserver.git;a=blobdiff_plain;f=contrib%2Fyum-3.2.4-chroot.patch;fp=contrib%2Fyum-3.2.4-chroot.patch;h=fd6c0231e02bd3082ba3d3ce87f6ca6be92c0a24;hp=5900cb34b6a15a4fd4ecfdc6e49e46506a90793c;hb=163f7ad70acc6a5cc32b170ac4c5cfa2f996a9c9;hpb=12fb89d20ac9b975ab861d827672203468a38541 diff --git a/contrib/yum-3.2.4-chroot.patch b/contrib/yum-3.2.4-chroot.patch index 5900cb3..fd6c023 100644 --- a/contrib/yum-3.2.4-chroot.patch +++ b/contrib/yum-3.2.4-chroot.patch @@ -74,15 +74,18 @@ reposdir = ListOption(['/etc/yum/repos.d', '/etc/yum.repos.d']) syslog_ident = Option() syslog_facility = Option('LOG_DAEMON') -@@ -615,7 +636,7 @@ def readMainConfig(startupconf): +@@ -615,9 +636,9 @@ def readMainConfig(startupconf): yumconf.populate(startupconf._parser, 'main') # Apply the installroot to directory options - for option in ('cachedir', 'logfile', 'persistdir'): + for option in ('cachedir', 'logfile', 'persistdir', 'lockfile'): path = getattr(yumconf, option) - setattr(yumconf, option, yumconf.installroot + path) +- setattr(yumconf, option, yumconf.installroot + path) ++ setattr(yumconf, option, yumconf.getRootedPath(path)) + # Add in some extra attributes which aren't actually configuration values + yumconf.yumvar = yumvars --- yum-3.2.4/docs/yum.conf.5.chroot +++ yum-3.2.4/docs/yum.conf.5 @@ -23,8 +23,10 @@ The [main] section must exist for yum to