diff options
| author |   wiktor w brodlo <wiktor@brodlo.net> | 2011-07-09 16:36:13 +0000 |
|---|---|---|
| committer | wiktor w brodlo <wiktor@brodlo.net> | 2011-07-09 16:36:13 +0000 |
| commit | e4519ff2161039db755fe541b54b0b0cf8224ea5 (patch) | |
| tree | 5d15428323dd44a2761918a410c9ed5eeb4180b7 /gentoo | |
| parent | gentoo/utils.py: copy kernel and modules from liveDVD (diff) | |
| download | anaconda-e4519ff2161039db755fe541b54b0b0cf8224ea5.tar.gz anaconda-e4519ff2161039db755fe541b54b0b0cf8224ea5.tar.bz2 anaconda-e4519ff2161039db755fe541b54b0b0cf8224ea5.zip | |
Preliminary Xorg support
Diffstat (limited to 'gentoo')
| -rw-r--r-- | gentoo/livecd.py | 2 | ||||
| -rw-r--r-- | gentoo/utils.py | 26 |
2 files changed, 20 insertions, 8 deletions
diff --git a/gentoo/livecd.py b/gentoo/livecd.py index 9a03445..1ea10f1 100644 --- a/gentoo/livecd.py +++ b/gentoo/livecd.py @@ -140,7 +140,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend): self._gentoo_install.setup_sudo() self._gentoo_install.setup_audio() self._progress.set_fraction(0.3) - #self._gentoo_install.setup_xorg() + 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 #try: diff --git a/gentoo/utils.py b/gentoo/utils.py index 67d300f..542da39 100644 --- a/gentoo/utils.py +++ b/gentoo/utils.py @@ -595,14 +595,26 @@ class GentooInstall: source_f.close() def setup_xorg(self): + # These days things should work without xorg.conf # Copy current xorg.conf - live_xorg_conf = "/etc/X11/xorg.conf" - if not os.path.isfile(live_xorg_conf): - return - xorg_conf = self._root + live_xorg_conf - shutil.copy2(live_xorg_conf, xorg_conf) - shutil.copy2(live_xorg_conf, xorg_conf+".original") - + #live_xorg_conf = "/etc/X11/xorg.conf" + #if not os.path.isfile(live_xorg_conf): + # return + #xorg_conf = self._root + live_xorg_conf + #shutil.copy2(live_xorg_conf, xorg_conf) + #shutil.copy2(live_xorg_conf, xorg_conf+".original") + # Packages should depend on Xorg so it will be pulled automatically + if self._anaconda.xorg == "fluxbox": + self.install_package("x11-wm/fluxbox") + if self._anaconda.xorg == "gnome": + self.install_package("gnome-base/gnome") + if self._anaconda.xorg == "kde": + self.install_package("kde-base/kde-meta") + if self._anaconda.xorg == "lxde": + self.install_package("lxde-base/lxde-meta") + if self._anaconda.xorg == "xfce4": + self.install_package("xfce-base/xfce4-meta") + def setup_language(self): # Prepare locale variables |