[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/80: installer: Add alternate method of finding TZDIR.
From: |
John Darrington |
Subject: |
14/80: installer: Add alternate method of finding TZDIR. |
Date: |
Tue, 3 Jan 2017 15:49:41 +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
- 49/80: installer: Wrap installer in (catch #t ...), (continued)
- 49/80: installer: Wrap installer in (catch #t ...), John Darrington, 2017/01/03
- 09/80: installer: Use a record instead of a list to contain tasks., John Darrington, 2017/01/03
- 29/80: installer: Deal with partition tables which are (partially) corrupt., John Darrington, 2017/01/03
- 37/80: installer: Improve dependencies on the final task., John Darrington, 2017/01/03
- 31/80: gnu: Add service to start the installer in installation-os., John Darrington, 2017/01/03
- 36/80: installer: Remove ad-hoc completed predicate and use standard one., John Darrington, 2017/01/03
- 35/80: installer: Make minumum-store-size variable global., John Darrington, 2017/01/03
- 34/80: installer: Add path to mount/umount commands in installer service., John Darrington, 2017/01/03
- 58/80: installer: Allow users to remove mount points during configuration., John Darrington, 2017/01/03
- 11/80: installer: Change "interfaces" from a variable to a procedure., John Darrington, 2017/01/03
- 14/80: installer: Add alternate method of finding TZDIR.,
John Darrington <=
- 13/80: installer: Use call-with-temporary-output-file., John Darrington, 2017/01/03
- 22/80: installer: Return slurped lines in their correct order., John Darrington, 2017/01/03
- 16/80: installer: Use %default-subsitute-urls instead of our own variable., John Darrington, 2017/01/03
- 10/80: installer: Perform a task's dependencies prior to the task itself., John Darrington, 2017/01/03
- 18/80: installer: Add completion predicate for disk task., John Darrington, 2017/01/03
- 20/80: installer: Remove unused procedure., John Darrington, 2017/01/03
- 30/80: installer: Add a variable to represent the minimum recommended store size., John Darrington, 2017/01/03
- 44/80: installer: Add wireless-tools bin directory to PATH., John Darrington, 2017/01/03
- 41/80: install: Define new procedure pipe-cmd and use it to implement window-pipe., John Darrington, 2017/01/03
- 40/80: installer: Ensure that all mount-points have a file system., John Darrington, 2017/01/03