[gentoo-commits] proj/anaconda:master commit in: gentoo/

["Wiktor W Brodlo" <wiktor@brodlo.net>]

commit:     74e00a2e84a510e000923d5530b5380d1df13c7d
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul  8 17:54:42 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul  8 17:54:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=74e00a2e

Install the kernel

---
 gentoo/livecd.py |    4 +++-
 gentoo/utils.py  |   23 +++++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 9e1c59a..9a03445 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -121,6 +121,8 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
         self._gentoo_install.write_makeconf()
         self._gentoo_install.install_setup_tools()
         
+        self._gentoo_install.install_kernel()
+        
         action = _("Configuring Gentoo")
         self._progress.set_label(action)
         self._progress.set_fraction(0.0)
@@ -174,7 +176,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
     def doPostInstall(self, anaconda):
 
         #self._gentoo_install.setup_portage_mirrors()
-        self._gentoo_install.language_packs_install()
+        #self._gentoo_install.language_packs_install()
         self._gentoo_install.emit_install_done()
 
         storage.writeEscrowPackets(anaconda)

diff --git a/gentoo/utils.py b/gentoo/utils.py
index 227a62f..96ece10 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -29,6 +29,7 @@ import sys
 import stat
 import sys
 import subprocess
+import commands
 import shutil
 import statvfs
 import tempfile
@@ -993,17 +994,17 @@ class GentooInstall:
         keywordsf.write("dev-python/rhpl ~amd64 ~x86\nsys-boot/grub **\nsys-boot/os-prober ~amd64 ~x86")
         keywordsf.close()
         self.install_package("-1 system-config-date")   
-        self._progress.set_fraction(0.5)
+        self._progress.set_fraction(0.3)
         self.install_package("-1 system-config-keyboard")
-        self._progress.set_fraction(0.6)
+        self._progress.set_fraction(0.4)
         self.install_package("-1 system-config-users")
-        self._progress.set_fraction(0.7)
+        self._progress.set_fraction(0.5)
         self.install_package("-1 keyboard-configuration-helpers")
-        self._progress.set_fraction(0.8)
+        self._progress.set_fraction(0.6)
         self.install_package("-1 language-configuration-helpers")
-        self._progress.set_fraction(0.9)
+        self._progress.set_fraction(0.7)
         self.install_package("-1 =grub-1.99")
-        self._progress.set_fraction(1.0)
+        self._progress.set_fraction(0.8)
         del os.environ["USE"]
     
     def set_profile(self):
@@ -1052,6 +1053,16 @@ class GentooInstall:
         self.install_package(self._anaconda.syslog)
         self._progress.set_fraction(0.9)
         
+    def install_kernel(self):
+        self._progress.set_text(_("Installing the kernel"))
+        self.install_package("<gentoo-sources-2.6.38") # version on LiveDVD
+        self.spawn_chroot("eselect kernel set 1")
+        self._progress.set_fraction(0.9)
+        commands.getoutput("gunzip -c /proc/config.gz > %s/usr/src/linux/.config" % self._root)
+        self._anaconda._intf.instProgress.terminal.run_command(
+            "chroot %s /bin/bash -c 'cd /usr/src/linux ; make modules_install'" % self._root)
+        self._progress.set_fraction(1.0)
+        
     def _get_langpacks(self):
         return None