[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
21/22: installer: Correct bugs generating the configuration.
From: |
John Darrington |
Subject: |
21/22: installer: Correct bugs generating the configuration. |
Date: |
Tue, 27 Dec 2016 06:02:09 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 9ede0bf6d80f4ceee55329734e82fe3d6cdd18eb
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)
- 16/22: installer: Improve dependencies on the final task., (continued)
- 16/22: installer: Improve dependencies on the final task., John Darrington, 2016/12/27
- 22/22: gnu: Add guix to the path environment for the guix-installer service., John Darrington, 2016/12/27
- 09/22: installer: Add a variable to represent the minimum recommended store size., John Darrington, 2016/12/27
- 17/22: installer: Replace some instances of "car"., John Darrington, 2016/12/27
- 20/22: install: Define new procedure pipe-cmd and use it to implement window-pipe., John Darrington, 2016/12/27
- 03/22: installer: Make "interfaces" return an alist., John Darrington, 2016/12/27
- 13/22: installer: Add path to mount/umount commands in installer service., John Darrington, 2016/12/27
- 10/22: gnu: Add service to start the installer in installation-os., John Darrington, 2016/12/27
- 11/22: installer: Add a task to actually call guix system init., John Darrington, 2016/12/27
- 18/22: installer: New predicate valid-hostname?, John Darrington, 2016/12/27
- 21/22: installer: Correct bugs generating the configuration.,
John Darrington <=
- 08/22: installer: Deal with partition tables which are (partially) corrupt., John Darrington, 2016/12/27
- 05/22: installer: Add a new menu to configure wireless interfaces., John Darrington, 2016/12/27
- 07/22: installer: Let the kernel know about (possibly) changed partitions., John Darrington, 2016/12/27
- 19/22: installer: Ensure that all mount-points have a file system., John Darrington, 2016/12/27
- 12/22: installer: Write the configuration to a temporary file., John Darrington, 2016/12/27