[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
38/197: installer: Correct bugs generating the configuration.
From: |
Danny Milosavljevic |
Subject: |
38/197: installer: Correct bugs generating the configuration. |
Date: |
Mon, 3 Jul 2017 20:36:56 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit 8735eb12a041d6606f2570afaa64b46e5e235639
Author: John Darrington <address@hidden>
Date: Mon Dec 26 20:19:22 2016 +0100
installer: Correct bugs generating the configuration.
* gnu/system/installer/configure.scm (generate-guix-config): Add
use-modules,
and correct errors in the file-system stanza.
---
gnu/system/installer/configure.scm | 83 +++++++++++++++++++++++---------------
1 file changed, 50 insertions(+), 33 deletions(-)
diff --git a/gnu/system/installer/configure.scm
b/gnu/system/installer/configure.scm
index 69a3bce..1013116 100644
--- a/gnu/system/installer/configure.scm
+++ b/gnu/system/installer/configure.scm
@@ -102,39 +102,56 @@
(define (generate-guix-config p)
- (pretty-print
- `(operating-system
- (timezone ,time-zone)
- (host-name ,host-name)
- (locale "POSIX")
- ,(let ((grub-mount-point
- (find-mount-device "/boot/grub"
- mount-points)))
- (if grub-mount-point
- `(bootloader
- (grub-configuration
- (device
- ,(disk-name
- (assoc-ref
- (partition-volume-pairs)
- (find-partition grub-mount-point))))
- (timeout 2)))))
-
- (file-systems
- (cons*
- ,(map (lambda (x)
- (let ((z (find-partition (car x))))
- `(filesystem
- (device ,(car x))
- (title 'device)
- (mount-point ,(cdr x))
- (type ,(partition-fs z)))))
- mount-points)
- %base-file-systems))
- (users (cons* %base-user-accounts))
- (packages (cons* nss-certs %base-packages))
- (services (cons* %desktop-services))
- (name-service-switch %mdns-host-lookup-nss)) p))
+ (let ((grub-mount-point
+ (find-mount-device "/boot/grub"
+ mount-points)))
+
+ (pretty-print `(use-modules
+ (gnu)
+ ,(when grub-mount-point
+ `(gnu system grub))
+
+ (gnu system nss))
+ p)
+ (newline p)
+
+ (pretty-print
+ `(use-service-modules desktop) p)
+ (newline p)
+
+ (pretty-print
+ `(use-package-modules certs) p)
+ (newline p)
+
+ (pretty-print
+ `(operating-system
+ (timezone ,time-zone)
+ (host-name ,host-name)
+ (locale "en_US.UTF-8")
+ ,(when grub-mount-point
+ `(bootloader
+ (grub-configuration
+ (device
+ ,(disk-name
+ (assoc-ref
+ (partition-volume-pairs)
+ (find-partition grub-mount-point))))
+ (timeout 2))))
+
+ (file-systems
+ ,(append (list 'cons*)
+ (map (lambda (x)
+ (let ((z (find-partition (car x))))
+ `(file-system
+ (device ,(car x))
+ (title 'device)
+ (mount-point ,(cdr x))
+ (type ,(partition-fs z))))) mount-points)
+ (list '%base-file-systems)))
+ (users (cons* %base-user-accounts))
+ (packages (cons* nss-certs %base-packages))
+ (services (cons* %desktop-services))
+ (name-service-switch %mdns-host-lookup-nss)) p)))
(define (configure-page-init p)
- 10/197: installer: Perform a task's dependencies prior to the task itself., (continued)
- 10/197: installer: Perform a task's dependencies prior to the task itself., Danny Milosavljevic, 2017/07/03
- 22/197: installer: Make "interfaces" return an alist., Danny Milosavljevic, 2017/07/03
- 26/197: installer: Let the kernel know about (possibly) changed partitions., Danny Milosavljevic, 2017/07/03
- 27/197: installer: Deal with partition tables which are (partially) corrupt., Danny Milosavljevic, 2017/07/03
- 28/197: installer: Add a variable to represent the minimum recommended store size., Danny Milosavljevic, 2017/07/03
- 32/197: installer: Remove ad-hoc completed predicate and use standard one., Danny Milosavljevic, 2017/07/03
- 34/197: installer: Replace some instances of "car"., Danny Milosavljevic, 2017/07/03
- 40/197: installer: Turn off kernel ring messages to console., Danny Milosavljevic, 2017/07/03
- 37/197: install: Define new procedure pipe-cmd and use it to implement window-pipe., Danny Milosavljevic, 2017/07/03
- 41/197: installer: Enable scrolling in the installation window., Danny Milosavljevic, 2017/07/03
- 38/197: installer: Correct bugs generating the configuration.,
Danny Milosavljevic <=
- 45/197: installer: Fix bug where window-pipe did not return the proper exit status., Danny Milosavljevic, 2017/07/03
- 43/197: installer: Rename module "new" to "guixsd-installer"., Danny Milosavljevic, 2017/07/03
- 42/197: installer: Wrap installer in (catch #t ...), Danny Milosavljevic, 2017/07/03
- 48/197: installer: Close unused ports in pipe-cmd., Danny Milosavljevic, 2017/07/03
- 47/197: installer: Improve install page., Danny Milosavljevic, 2017/07/03
- 29/197: installer: Add a task to actually call guix system init., Danny Milosavljevic, 2017/07/03
- 53/197: installer: Change N_ from a procedure to a macro., Danny Milosavljevic, 2017/07/03
- 50/197: installer: Issue message to user on failure of filesystems task., Danny Milosavljevic, 2017/07/03
- 61/197: installer: Indicate which wireless access points are encrypted., Danny Milosavljevic, 2017/07/03
- 59/197: installer: Format configuration to fix width of window., Danny Milosavljevic, 2017/07/03