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

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

commit:     21c33ba0722312d06a9852f98936c23d42c4483d
Author:     wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Fri Jul  8 14:48:19 2011 +0000
Commit:     Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Fri Jul  8 14:48:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=21c33ba0

Install systools

---
 gentoo/livecd.py |   18 ++++++++++++------
 gentoo/utils.py  |    7 +++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 148967b..7722670 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -121,21 +121,23 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
         self._gentoo_install.write_makeconf()
         self._gentoo_install.install_setup_tools()
         
+        action = _("Configuring Gentoo")
+        self._progress.set_label(action)
+        self._progress.set_fraction(0.0)
+        
         self._gentoo_install.setup_users()
         self._gentoo_install.setup_language() # before ldconfig, thx
+        self._progress.set_fraction(0.1)
         # if simple networking is enabled, disable NetworkManager
         if self.anaconda.instClass.simplenet:
             self._gentoo_install.setup_manual_networking()
         else:
             self._gentoo_install.setup_networkmanager_networking()
         self._gentoo_install.setup_keyboard()
-
-        action = _("Configuring Gentoo")
-        self._progress.set_label(action)
-        self._progress.set_fraction(0.9)
-
+        self._progress.set_fraction(0.2)
         self._gentoo_install.setup_sudo()
         self._gentoo_install.setup_audio()
+        self._progress.set_fraction(0.3)
         #self._gentoo_install.setup_xorg()
         #self._gentoo_install.remove_proprietary_drivers()
         # TODO: This needs to be tried and fixed properly on Gentoo once installing X works
@@ -145,12 +147,14 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
         #    # caused by Entropy bug <0.99.47.2, remove in future
         #    log.error("Unable to install legacy nvidia drivers: %s" % e)
 
-        self._progress.set_fraction(0.95)
         self._gentoo_install.configure_services()
+        self._progress.set_fraction(0.4)
         self._gentoo_install.copy_udev()
         self._gentoo_install.env_update()
+        self._progress.set_fraction(0.5)
         self._gentoo_install.spawn_chroot("locale-gen", silent = True)
         self._gentoo_install.spawn_chroot("ldconfig")
+        self._progress.set_fraction(0.6)
         # Fix a possible /tmp problem
         self._gentoo_install.spawn("chmod a+w "+self._root+"/tmp")
         var_tmp = self._root + "/var/tmp"
@@ -161,6 +165,8 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
             with open(var_tmp_keep, "w") as wt:
                 wt.flush()
 
+        self._progress.set_fraction(0.7)
+        self._gentoo_install.install_systools()
         action = _("Gentoo configuration complete")
         self._progress.set_label(action)
         self._progress.set_fraction(1.0)

diff --git a/gentoo/utils.py b/gentoo/utils.py
index 2c8e171..31850ab 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -1045,6 +1045,13 @@ class GentooInstall:
         
         return "\n".join([cflags, cxxflags, chost, makeopts, gentoo_mirrors, sync, use])
         
+    def install_systools(self):
+        self._progress.set_text(_("Installing system tools"))
+        self.install_package(self._anaconda.cron)
+        self._progress.set_fraction(0.8)
+        self.install_package(self._anaconda.syslog)
+        self._progress.set_fraction(0.9)
+        
     def _get_langpacks(self):
         return None