diff options
| -rwxr-xr-x | anaconda | 1 | ||||
| -rw-r--r-- | gentoo/livecd.py | 2 | ||||
| -rw-r--r-- | gentoo/utils.py | 26 |
3 files changed, 21 insertions, 8 deletions
@@ -512,6 +512,7 @@ class Anaconda(object): self.upgradeSwapInfo = None self.use_flags = [] self._users = None + self.xorg = None # *sigh* we still need to be able to write this out self.xdriver = None 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 |