diff options
| author |   Andrew Gaffney <agaffney@gentoo.org> | 2007-11-17 18:15:42 +0000 |
|---|---|---|
| committer | Andrew Gaffney <agaffney@gentoo.org> | 2007-11-17 18:15:42 +0000 |
| commit | 40714a24e42a7623d4fc2afd93da048251474f1b (patch) | |
| tree | 476e974271a942b9b6c1cd19eba0f8815a9b0b37 | |
| parent | make install log location consistent throughout code (diff) | |
| download | gli-40714a24e42a7623d4fc2afd93da048251474f1b.tar.gz gli-40714a24e42a7623d4fc2afd93da048251474f1b.tar.bz2 gli-40714a24e42a7623d4fc2afd93da048251474f1b.zip | |
set TIMEZONE in /etc/conf.d/clock for bug 158882
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1859 f8877401-5920-0410-a79b-8e2d7e04ca0d
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/GLIArchitectureTemplate.py | 2 |
2 files changed, 6 insertions, 0 deletions
@@ -3,6 +3,10 @@ # $Header: /var/cvsroot/gentoo/src/installer/ChangeLog,v 1.686 2006/09/15 16:37:11 agaffney Exp $ 17 Nov 2007; Andrew Gaffney <agaffney@gentoo.org> + src/GLIArchitectureTemplate.py: + set TIMEZONE in /etc/conf.d/clock for bug 158882 + + 17 Nov 2007; Andrew Gaffney <agaffney@gentoo.org> src/GLIArchitectureTemplate.py, src/GLIClientController.py, src/fe/gtk/InstallFailed.py, src/fe/gtk/gtkfe.py: make install log location consistent throughout code diff --git a/src/GLIArchitectureTemplate.py b/src/GLIArchitectureTemplate.py index a4c1a68..0bcd8f4 100644 --- a/src/GLIArchitectureTemplate.py +++ b/src/GLIArchitectureTemplate.py @@ -646,6 +646,8 @@ class ArchitectureTemplate: GLIUtility.spawn("rm "+self._chroot_dir + "/etc/localtime") if self._debug: self._logger.log("DEBUG: running ln -s ../usr/share/zoneinfo/" + self._install_profile.get_time_zone() + " /etc/localtime") GLIUtility.spawn("ln -s ../usr/share/zoneinfo/" + self._install_profile.get_time_zone() + " /etc/localtime", chroot=self._chroot_dir) + if self._debug: self._logger.log("DEBUG: Setting TIMEZONE to %s in /etc/conf.d/clock" % self._install_profile.get_time_zone()) + self._edit_config(self._chroot_dir + "/etc/conf.d/clock", {"TIMEZONE": self._install_profile.get_time_zone()}) if not (self._install_profile.get_time_zone() == "UTC"): if self._debug: self._logger.log("DEBUG: timezone was not UTC, setting CLOCK to local. This may be overwritten later.") self._edit_config(self._chroot_dir + "/etc/conf.d/clock", {"CLOCK":"local"}) |