diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-10-20 15:13:16 +0200 |
|---|---|---|
| committer | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2024-11-11 07:28:35 +0100 |
| commit | 687a2ccabc6f57fcd25110f587df90ed0cab2f05 (patch) | |
| tree | a71dbeb96fc115b3abf796ba254842d98c0271e6 /gnu/installer/final.scm | |
| parent | 9aeb8e3dee32254a19a68971f26e214c7b717e5b (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/final.scm')
| -rw-r--r-- | gnu/installer/final.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index 069426a3b8d..64c054cd86c 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com> | 2 | ;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com> |
| 3 | ;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org> | 3 | ;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org> |
| 4 | ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> | ||
| 4 | ;;; | 5 | ;;; |
| 5 | ;;; This file is part of GNU Guix. | 6 | ;;; This file is part of GNU Guix. |
| 6 | ;;; | 7 | ;;; |
| @@ -25,6 +26,7 @@ | |||
| 25 | #:use-module (gnu services herd) | 26 | #:use-module (gnu services herd) |
| 26 | #:use-module (guix build syscalls) | 27 | #:use-module (guix build syscalls) |
| 27 | #:use-module (guix build utils) | 28 | #:use-module (guix build utils) |
| 29 | #:use-module (guix utils) | ||
| 28 | #:use-module (gnu build accounts) | 30 | #:use-module (gnu build accounts) |
| 29 | #:use-module (gnu build install) | 31 | #:use-module (gnu build install) |
| 30 | #:use-module (gnu build linux-container) | 32 | #:use-module (gnu build linux-container) |
| @@ -164,8 +166,11 @@ or #f. Return #t on success and #f on failure." | |||
| 164 | "/tmp/installer-system-init-options" | 166 | "/tmp/installer-system-init-options" |
| 165 | read)) | 167 | read)) |
| 166 | (const '()))) | 168 | (const '()))) |
| 167 | (install-command (append (list "guix" "system" "init" | 169 | (install-command (append `( "guix" "system" "init" |
| 168 | "--fallback") | 170 | "--fallback" |
| 171 | ,@(if (target-hurd?) | ||
| 172 | '("--target=i586-pc-gnu") | ||
| 173 | '())) | ||
| 169 | options | 174 | options |
| 170 | (list (%installer-configuration-file) | 175 | (list (%installer-configuration-file) |
| 171 | (%installer-target-dir)))) | 176 | (%installer-target-dir)))) |
