[PATCH rhel7-branch] Don't change langpacks config of installer environment (#1066017)

Radek Vykydal rvykydal at redhat.com
Fri Jul 11 08:33:29 UTC 2014


Also copy the configuration to target system.

Resolves: rhbz#1066017
---
 pyanaconda/packaging/yumpayload.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 211e5e9..0b7ec0d 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -119,6 +119,8 @@ class YumLock(object):
 
 _yum_lock = YumLock()
 _yum_cache_dir = "/tmp/yum.cache"
+_yum_installer_langpack_conf = "/tmp/yum.pluginconf.d/langpacks.conf"
+_yum_target_langpack_conf = "/etc/yum/pluginconf.d/langpacks.conf"
 
 class YumPayload(PackagePayload):
     """ A YumPayload installs packages onto the target system using yum.
@@ -244,10 +246,17 @@ class YumPayload(PackagePayload):
     def _writeLangpacksConfig(self):
         langs = [self.data.lang.lang] + self.data.lang.addsupport
         log.debug("configuring langpacks for %s" % langs)
-        with open("/etc/yum/pluginconf.d/langpacks.conf", "a") as f:
+        iutil.mkdirChain(os.path.dirname(_yum_installer_langpack_conf))
+        shutil.copy2(_yum_target_langpack_conf,
+                     _yum_installer_langpack_conf)
+        with open(_yum_installer_langpack_conf, "a") as f:
             f.write("# Added by Anaconda\n")
             f.write("langpack_locales = %s\n" % ", ".join(langs))
 
+    def _copyLangpacksConfigToTarget(self):
+        shutil.copy2(_yum_installer_langpack_conf,
+                     ROOT_PATH+_yum_target_langpack_conf)
+
     def _writeYumConfig(self):
         """ Write out anaconda's main yum configuration file. """
         buf = """
@@ -257,12 +266,13 @@ keepcache=0
 logfile=/tmp/yum.log
 metadata_expire=never
 pluginpath=/usr/lib/yum-plugins,/tmp/updates/yum-plugins
-pluginconfpath=/etc/yum/pluginconf.d,/tmp/updates/pluginconf.d
+pluginconfpath=%s,/etc/yum/pluginconf.d,/tmp/updates/pluginconf.d
 plugins=1
 debuglevel=3
 errorlevel=6
 reposdir=%s
-""" % (_yum_cache_dir, self._repos_dir)
+""" % (_yum_cache_dir, os.path.dirname(_yum_installer_langpack_conf),
+       self._repos_dir)
 
         if flags.noverifyssl:
             buf += "sslverify=0\n"
@@ -1739,6 +1749,7 @@ reposdir=%s
         self._removeTxSaveFile()
 
         self.writeMultiLibConfig()
+        self._copyLangpacksConfigToTarget()
 
         super(YumPayload, self).postInstall()
 
-- 
1.9.0



More information about the anaconda-patches mailing list