diff options
| author |   Andrew Gaffney <agaffney@gentoo.org> | 2006-08-07 12:11:46 +0000 |
|---|---|---|
| committer | Andrew Gaffney <agaffney@gentoo.org> | 2006-08-07 12:11:46 +0000 |
| commit | 814dff55418a99121ae479aa7b185238e8d84d31 (patch) | |
| tree | 21dbc55044194048c73574f701fb93dd01f4b1d1 /src/installer | |
| parent | moving the comma to the proper place, acked by vanquirius (diff) | |
| download | gentoo-814dff55418a99121ae479aa7b185238e8d84d31.tar.gz gentoo-814dff55418a99121ae479aa7b185238e8d84d31.tar.bz2 gentoo-814dff55418a99121ae479aa7b185238e8d84d31.zip | |
src/GLIArchitectureTemplate.py:
copy backup custom.conf from livecd if present
Diffstat (limited to 'src/installer')
| -rw-r--r-- | src/installer/ChangeLog | 6 | ||||
| -rw-r--r-- | src/installer/src/GLIArchitectureTemplate.py | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/installer/ChangeLog b/src/installer/ChangeLog index 17992972b6..353653fa5b 100644 --- a/src/installer/ChangeLog +++ b/src/installer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for Gentoo Linux Installer # Copyright 2005-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/installer/ChangeLog,v 1.670 2006/08/04 03:14:15 agaffney Exp $ +# $Header: /var/cvsroot/gentoo/src/installer/ChangeLog,v 1.671 2006/08/07 12:11:46 agaffney Exp $ + + 7 Aug 2006; Andrew Gaffney <agaffney@gentoo.org> + src/GLIArchitectureTemplate.py: + copy backup custom.conf from livecd if present *GLI-0.4 (31 Jul 2006) diff --git a/src/installer/src/GLIArchitectureTemplate.py b/src/installer/src/GLIArchitectureTemplate.py index 809bc1c04f..218fef3d56 100644 --- a/src/installer/src/GLIArchitectureTemplate.py +++ b/src/installer/src/GLIArchitectureTemplate.py @@ -5,7 +5,7 @@ # of which can be found in the main directory of this project. Gentoo Linux Installer -$Id: GLIArchitectureTemplate.py,v 1.283 2006/07/29 15:58:28 agaffney Exp $ +$Id: GLIArchitectureTemplate.py,v 1.284 2006/08/07 12:11:46 agaffney Exp $ The ArchitectureTemplate is largely meant to be an abstract class and an interface (yes, it is both at the same time!). The purpose of this is to create @@ -365,6 +365,8 @@ class ArchitectureTemplate: self._logger.log("xorg.conf copied to new system. X should be ready to roll!") if GLIUtility.is_file(self._chroot_dir + "/etc/X11/gdm/gdm.conf"): GLIUtility.spawn("cp -f /etc/X11/gdm/gdm.conf.old " + self._chroot_dir + "/etc/X11/gdm/gdm.conf") + if GLIUtility.is_file(self._chroot_dir + "/etc/X11/gdm/custom.conf"): + GLIUtility.spawn("cp -f /etc/X11/gdm/custom.conf.old " + self._chroot_dir + "/etc/X11/gdm/custom.conf") ## # Will set the list of services to runlevel default. This is a temporary solution! |