| 1 |
commit: 738fa1b2b589d978330258dc4cff0f80c0ee9378 |
| 2 |
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net> |
| 3 |
AuthorDate: Mon Jul 4 20:51:38 2011 +0000 |
| 4 |
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net> |
| 5 |
CommitDate: Mon Jul 4 20:51:38 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=738fa1b2 |
| 7 |
|
| 8 |
Install system-config-* to help Anaconda set up the new system |
| 9 |
|
| 10 |
--- |
| 11 |
gentoo/livecd.py | 5 +++++ |
| 12 |
gentoo/utils.py | 15 +++++++++++---- |
| 13 |
2 files changed, 16 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/gentoo/livecd.py b/gentoo/livecd.py |
| 16 |
index 388d889..da5b5b9 100644 |
| 17 |
--- a/gentoo/livecd.py |
| 18 |
+++ b/gentoo/livecd.py |
| 19 |
@@ -114,6 +114,11 @@ class LiveCDCopyBackend(backend.AnacondaBackend): |
| 20 |
|
| 21 |
# Actually install |
| 22 |
self._gentoo_install.live_install() |
| 23 |
+ |
| 24 |
+ # Now copy the portage tree |
| 25 |
+ self._gentoo_install.copy_portage() |
| 26 |
+ self._gentoo_install.emerge_setup_tools() |
| 27 |
+ |
| 28 |
self._gentoo_install.setup_users() |
| 29 |
self._gentoo_install.setup_language() # before ldconfig, thx |
| 30 |
# if simple networking is enabled, disable NetworkManager |
| 31 |
|
| 32 |
diff --git a/gentoo/utils.py b/gentoo/utils.py |
| 33 |
index 2f440bd..23d53df 100644 |
| 34 |
--- a/gentoo/utils.py |
| 35 |
+++ b/gentoo/utils.py |
| 36 |
@@ -174,7 +174,7 @@ class GentooInstall: |
| 37 |
self._intf = anaconda.intf |
| 38 |
self._progress = GentooProgress(anaconda) |
| 39 |
self._portage = Portage(anaconda._intf.instProgress.terminal) |
| 40 |
- # I'm wondering what's it actually for. ~w. |
| 41 |
+ # I'm wondering what's it actually for. ~w. |
| 42 |
#self._settings = SystemSettings() |
| 43 |
with open("/proc/cmdline", "r") as cmd_f: |
| 44 |
self.cmdline = cmd_f.readline().strip().split() |
| 45 |
@@ -1051,9 +1051,16 @@ class GentooInstall: |
| 46 |
self._progress.set_label("%s: %s" % ( |
| 47 |
_("Setting up mirrors"), _("not yet..."),)) |
| 48 |
|
| 49 |
- def update_portage_repositories(self): |
| 50 |
- self._portage.sync() |
| 51 |
- |
| 52 |
+ def copy_portage(self): |
| 53 |
+ self._progress.set_fraction(0.0) |
| 54 |
+ self._progress.set_text(_"Copying the Portage tree") |
| 55 |
+ subprocess.Popen("cp", "--recursive", "/usr/portage", self._root+"/usr/") |
| 56 |
+ # We need some packages from anaconda-overlay but ideally they should be added to portage |
| 57 |
+ self._progress.set_fraction(0.5) |
| 58 |
+ subprocess.Popen("cp", "--recursive", "/anaconda-overlay", self._root+"/usr/portage") |
| 59 |
+ |
| 60 |
+ def install_setup_tools(self): |
| 61 |
+ self._portage.install("system-config-date system-config-keyboard system-config-users") |
| 62 |
|
| 63 |
#def _get_langpacks(self): |
| 64 |
# return [x.strip() for x in LANGUAGE_PACKS.split("\n") if \ |
Archives