From 103be1cbd1504d320c66cf8fd2ebf9ec26488454 Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Thu, 21 Apr 2011 17:34:48 +0400
Subject: [PATCH] Fix video driver reinstall.

---
 i18n/cl_install_ru.mo  | Bin 24290 -> 24426 bytes
 pym/cl_fill_install.py |   8 ++------
 pym/cl_install.py      |  17 ++++++++++++++++-
 pym/cl_kernel_utils.py |  10 ++++++++++
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/i18n/cl_install_ru.mo b/i18n/cl_install_ru.mo
index ac2f2f92bbab427a13273a1a105b2fe936807fc8..9c998dd1c6660d3e7126acb7e764fb3e80a89873 100644
GIT binary patch
delta 4689
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

delta 4553
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

diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py
index 41dae0d..d328583 100644
--- a/pym/cl_fill_install.py
+++ b/pym/cl_fill_install.py
@@ -23,7 +23,7 @@ from cl_datavars import glob_attr
 from os import path
 from os import readlink,access,R_OK
 from cl_utils import isMount,typeFile,getTupleVersion,pathJoin,isFstabMount,\
-                     listDirectory
+                     listDirectory, getAvailableX11Drivers
 from cl_distr import DistributiveRepository,PartitionDistributive
 from cl_fill import clLocale
 from operator import itemgetter
@@ -864,11 +864,7 @@ class fillVars(object, glob_attr):
     def get_os_install_x11_video_drv(self):
         """Video driver used by xorg"""
         if self.Get('os_install_root_type') == 'usb-hdd':
-            xorg_modules_dir = '/usr/lib/xorg/modules/drivers'
-            avialable_drivers = \
-                map(lambda x: x[:-7],
-                filter(lambda x: x.endswith('_drv.so'),
-                listDirectory(xorg_modules_dir)))
+            avialable_drivers = getAvailableX11Drivers()
             videoVal = self.getValueFromCmdLine("calculate","video")
             videoVal = {'i915':'intel'}.get(videoVal,videoVal)
             if videoVal in list_avialable_drivers:
diff --git a/pym/cl_install.py b/pym/cl_install.py
index 760d080..8a2e816 100644
--- a/pym/cl_install.py
+++ b/pym/cl_install.py
@@ -849,6 +849,8 @@ class cl_install(color_print, SignalInterrupt):
                 self.clVars.Get('hr_cpu_num'))
         self.printSUCCESS(_("Videocard vendor")+": %s"%
                 self.clVars.Get('hr_video'))
+        self.printSUCCESS(_("{0} video driver").format("Xorg")+": %s"%
+                self.clVars.Get('os_install_x11_video_drv'))
         self.printSUCCESS(_("Screen resolution")+": %s"%
                 self.clVars.Get('os_install_x11_resolution'))
         self.defaultPrint("%s\n"%_("Localization"))
@@ -1767,7 +1769,20 @@ class cl_install(color_print, SignalInterrupt):
                 if path.exists(pathGlModules):
                     self.printMessageForTest(_("Configure OpenGL"))
                     self.printByResult(self.setupOpenGL())
-
+                # if change video driver, then restore initramfs
+                installDrv = self.clVars.Get('os_install_x11_video_drv')
+                if self.clVars.Get('os_x11_video_drv') != installDrv:
+                    initrdPath = path.join('/boot',
+                                self.clVars.Get('os_install_initrd'))
+                    initrdInstallPath = path.join('/boot',
+                                self.clVars.Get('os_install_initrd_install'))
+                    needMod = {'radeon':'radeon',
+                               'intel':'i915',
+                               'nouveau':'nouveau'}.get(installDrv,'uvesafb')
+                    if not InitRamFs(initrdPath).isModuleInside(needMod):
+                        self.printMessageForTest(_("Restore initramfs"))
+                        self.printByResult(InitRamFs(initrdInstallPath)\
+                                .cleanInitRamFs(initrdPath, x11_video_drv))
             except (InstallError,DistributiveError),e:
                 error = e
             except Exception,e:
diff --git a/pym/cl_kernel_utils.py b/pym/cl_kernel_utils.py
index 42944cc..2cae14b 100644
--- a/pym/cl_kernel_utils.py
+++ b/pym/cl_kernel_utils.py
@@ -133,6 +133,16 @@ class InitRamFs:
         os.chdir(self.prevDir)
         return res
 
+    def searchInside(self,searchFunc):
+        """Search data in file list of initramfs"""
+        cpioProcess = process("cpio", "-tf",
+                stdin=process("gzip", "-dc", self.initrdFile))
+        return filter(searchFunc,cpioProcess)
+
+    def isModuleInside(self,moduleName):
+        """Search module in initramfs"""
+        return bool(self.searchInside(lambda x: "%s.ko"%moduleName in x))
+
     def _packInitRamfs(self,newInitramfsFile=None):
         """Pack initramfs"""
         self.prevDir = os.getcwd()