[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/21: installer: Add alternate method of finding TZDIR.
From: |
John Darrington |
Subject: |
14/21: installer: Add alternate method of finding TZDIR. |
Date: |
Thu, 22 Dec 2016 19:58:40 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 90322eea3b0a81bbd1669a8014b39b3553192ab2
Author: John Darrington <address@hidden>
Date: Wed Dec 21 20:28:02 2016 +0100
installer: Add alternate method of finding TZDIR.
* gnu/system/installer/new.scm (main-options): Provide alternative method
of finding
the timezone directory.
---
gnu/system/installer/new.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/system/installer/new.scm b/gnu/system/installer/new.scm
index 9b18251..5646dfb 100644
--- a/gnu/system/installer/new.scm
+++ b/gnu/system/installer/new.scm
@@ -88,7 +88,10 @@
(lambda (page)
(make-tz-browser
page
- (getenv "TZDIR")
+ (or
+ (getenv "TZDIR")
+ (string-append (car (slurp "guix build tzdata" #f))
+ "/share/zoneinfo"))
page-stack))))
(hostname . ,(make-task hostname-menu-title
@@ -101,7 +104,7 @@
(generate . ,(make-task
(N_ "Generate the configuration")
- '(filesystems hostname timezone)
+ '(filesystems timezone hostname)
(lambda () #f)
(lambda (page)
(make-dialog
- branch wip-installer created (now 704f546), John Darrington, 2016/12/22
- 05/21: installer: fix warning in usage of "format"., John Darrington, 2016/12/22
- 02/21: installer: Fix broken keymap change option., John Darrington, 2016/12/22
- 06/21: installer: use ice-9 format everywhere., John Darrington, 2016/12/22
- 03/21: installer: Remove obsolete procedures/variables, John Darrington, 2016/12/22
- 07/21: installer: Use ice-9 match., John Darrington, 2016/12/22
- 20/21: installer: Remove unused procedure., John Darrington, 2016/12/22
- 14/21: installer: Add alternate method of finding TZDIR.,
John Darrington <=
- 21/21: gnu: guix: Add dependency: guile-ncurses., John Darrington, 2016/12/22
- 17/21: installer: Add new procedure to get the list of volumes., John Darrington, 2016/12/22
- 18/21: installer: Add completion predicate for disk task., John Darrington, 2016/12/22
- 04/21: installer: Fix broken timezone menu., John Darrington, 2016/12/22
- 11/21: installer: Change "interfaces" from a variable to a procedure., John Darrington, 2016/12/22
- 13/21: installer: Use call-with-temporary-output-file., John Darrington, 2016/12/22
- 08/21: installer: Add IETF contraints for hostname in entry form., John Darrington, 2016/12/22
- 19/21: installer: Handle the 'back' action in the filesystems task., John Darrington, 2016/12/22
- 12/21: installer: Add gurses modules., John Darrington, 2016/12/22
- 10/21: installer: Perform a task's dependencies prior to the task itself., John Darrington, 2016/12/22