summaryrefslogtreecommitdiff
path: root/gnu/installer/steps.scm
diff options
context:
space:
mode:
authorJanneke Nieuwenhuizen <janneke@gnu.org>2024-10-20 15:13:16 +0200
committerJan (janneke) Nieuwenhuizen <janneke@gnu.org>2024-11-11 07:28:35 +0100
commit687a2ccabc6f57fcd25110f587df90ed0cab2f05 (patch)
treea71dbeb96fc115b3abf796ba254842d98c0271e6 /gnu/installer/steps.scm
parent9aeb8e3dee32254a19a68971f26e214c7b717e5b (diff)
installer: Add "Kernel" page to select the Hurd.
This adds a "Kernel" page to the installer with the option to (cross-) install the Hurd, if applicable (only available on x86 machines for now). * gnu/installer/newt.scm (kernel-page): New procedure. (newt-installer)[kernel-page]: New field. * gnu/installer/kernel.scm, gnu/installer/newt/kernel.scm: New files. * gnu/local.mk (INSTALLER_MODULES): Add them. * gnu/installer.scm (installer-steps): Use them to select kernel if applicable. * gnu/installer/newt/partition.scm (run-label-page): Default to "msdos" when instaling the Hurd. (run-fs-type-page): Add ext2 for the hurd. (run-partitioning-page-partition): Remove `entire-encrypted' option when installing the Hurd. * gnu/installer/services.scm (system-services->configuration): Cater for the Hurd with %base-services/hurd, and with %base-packages/hurd that must always be set. (%system-services): Change to procedure. When installing the the Hurd, do not recommend `ntp-service-type' and USE `openssh-sans-x' package for `openssh-service-type'. (system-service-none): New variable. * gnu/installer/newt/services.scm (run-network-management-page): Include it when installing the Hurd. (run-desktop-environments-cbt-page): When installing the Hurd, recommend to not select any desktop enviroment. Update users. * gnu/installer/parted.scm (efi-installation?): Return #f when installing for the Hurd. (create-ext2-file-system): New procedure. (user-fs-type-name, user-fs-type->mount-type, partition-filesystem-user-type, format-user-partitions): Support `ext2'. (<user-partition> partition->user-partition): Use `ext2' when installing the Hurd. (auto-partition!): Likewise. No swap partition when installing the Hurd. * gnu/installer/final.scm (install-system): Cater for cross installation of the Hurd. (bootloader-configuration): Use `grub-minimal-bootloader' when installing the Hurd. (user-partition-missing-modules): Cater for empty user-partitions. (initrd-configuration, user-partitions->configuration): Cater for the Hurd. * gnu/installer/steps.scm (format-configuration, configuration->file): Cater for the Hurd. * gnu/system/hurd.scm (%desktop-services/hurd): New variable. * gnu/installer/tests.scm (choose-kernel): New procedure. * gnu/tests/install.scm (gui-test-program): Use it. Change-Id: Ifafb27b8a2f933944c77223a27ec151757237e36
Diffstat (limited to 'gnu/installer/steps.scm')
-rw-r--r--gnu/installer/steps.scm14
1 files changed, 9 insertions, 5 deletions
diff --git a/gnu/installer/steps.scm b/gnu/installer/steps.scm
index de0a852f02a..34dd14c9d56 100644
--- a/gnu/installer/steps.scm
+++ b/gnu/installer/steps.scm
@@ -23,6 +23,7 @@
23 #:use-module (guix build utils) 23 #:use-module (guix build utils)
24 #:use-module (guix i18n) 24 #:use-module (guix i18n)
25 #:use-module (guix read-print) 25 #:use-module (guix read-print)
26 #:use-module (guix utils)
26 #:use-module (gnu installer utils) 27 #:use-module (gnu installer utils)
27 #:use-module (ice-9 match) 28 #:use-module (ice-9 match)
28 #:use-module (srfi srfi-1) 29 #:use-module (srfi srfi-1)
@@ -240,17 +241,20 @@ found in RESULTS."
240 ,(comment (G_ "\ 241 ,(comment (G_ "\
241;; Indicate which modules to import to access the variables 242;; Indicate which modules to import to access the variables
242;; used in this configuration.\n")) 243;; used in this configuration.\n"))
243 (use-modules (gnu)) 244 ,@(if (target-hurd?)
245 '((use-modules (gnu) (gnu system hurd))
246 (use-package-modules hurd ssh))
247 '((use-modules (gnu))))
244 (use-service-modules cups desktop networking ssh xorg)))) 248 (use-service-modules cups desktop networking ssh xorg))))
245 `(,@modules 249 `(,@modules
246 ,(vertical-space 1) 250 ,(vertical-space 1)
247 (operating-system ,@configuration)))) 251 (operating-system ,@configuration))))
248 252
249(define* (configuration->file configuration 253(define* (configuration->file configuration
250 #:key (filename (%installer-configuration-file))) 254 #:key (file-name (%installer-configuration-file)))
251 "Write the given CONFIGURATION to FILENAME." 255 "Write the given CONFIGURATION to FILE-NAME."
252 (mkdir-p (dirname filename)) 256 (mkdir-p (dirname file-name))
253 (call-with-output-file filename 257 (call-with-output-file file-name
254 (lambda (port) 258 (lambda (port)
255 ;; TRANSLATORS: This is a comment within a Scheme file. Each line must 259 ;; TRANSLATORS: This is a comment within a Scheme file. Each line must
256 ;; start with ";; " (two semicolons and a space). Please keep line 260 ;; start with ";; " (two semicolons and a space). Please keep line