amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

installer: Use `%' for parameter %run-command-in-installer.

Browse source 
* gnu/installer/utils.scm (run-command-in-installer): Rename to...
(%run-command-in-installer): ...this.
* gnu/installer.scm (installer-program): Update accordingly.
* gnu/installer/parted.scm (remove-logical-devices, create-btrfs-file-system,
create-ext4-file-system, create-fat16-file-system, create-fat32-file-system,
create-jfs-file-system, create-ntfs-file-system, create-xfs-file-system,
create-swap-partition, luks-format-and-open, luks-ensure-open, luks-close):
Update accordingly.

Change-Id: I96ebc59ebc85fd8ebccb0cc57130b4e7532d287f
This commit is contained in:
Janneke Nieuwenhuizen 2024-10-16 08:59:13 +02:00 • committed by Jan (janneke) Nieuwenhuizen
parent e57bc3bcde
commit cca544513b
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gnu/installer.scm
View file

@ -465,7 +465,7 @@ purposes."
(installer-init current-installer) (installer-init current-installer)
(lambda () (lambda ()
(parameterize (parameterize
((run-command-in-installer ((%run-command-in-installer
(installer-run-command current-installer))) (installer-run-command current-installer)))
(catch #t (catch #t
(lambda () (lambda ()

27
gnu/installer/parted.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2019-2020, 2022, 2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019-2020, 2022, 2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Josselin Poiret <dev@jpoiret.xyz> ;;; Copyright © 2022 Josselin Poiret <dev@jpoiret.xyz>
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -363,7 +364,7 @@ fail. See rereadpt function in wipefs.c of util-linux for an explanation."
(define (remove-logical-devices) (define (remove-logical-devices)
"Remove all active logical devices." "Remove all active logical devices."
((run-command-in-installer) "dmsetup" "remove_all")) ((%run-command-in-installer) "dmsetup" "remove_all"))
(define (installer-root-partition-path) (define (installer-root-partition-path)
"Return the root partition path, or #f if it could not be detected." "Return the root partition path, or #f if it could not be detected."
@ -1183,7 +1184,7 @@ list and return the updated list."
(define (create-btrfs-file-system partition) (define (create-btrfs-file-system partition)
"Create a btrfs file-system for PARTITION file-name." "Create a btrfs file-system for PARTITION file-name."
((run-command-in-installer) "mkfs.btrfs" "-f" partition)) ((%run-command-in-installer) "mkfs.btrfs" "-f" partition))
(define (create-ext4-file-system partition) (define (create-ext4-file-system partition)
"Create an ext4 file-system for PARTITION file-name." "Create an ext4 file-system for PARTITION file-name."
@ -1192,32 +1193,32 @@ list and return the updated list."
;; up and adding new files would fail with ENOSPC despite there being plenty ;; up and adding new files would fail with ENOSPC despite there being plenty
;; of free space and inodes: ;; of free space and inodes:
;; <https://blog.merovius.de/posts/2013-10-20-ext4-mysterious-no-space-left-on/>. ;; <https://blog.merovius.de/posts/2013-10-20-ext4-mysterious-no-space-left-on/>.
((run-command-in-installer) "mkfs.ext4" "-F" partition ((%run-command-in-installer) "mkfs.ext4" "-F" partition
"-O" "large_dir")) "-O" "large_dir"))
(define (create-fat16-file-system partition) (define (create-fat16-file-system partition)
"Create a fat16 file-system for PARTITION file-name." "Create a fat16 file-system for PARTITION file-name."
((run-command-in-installer) "mkfs.fat" "-F16" partition)) ((%run-command-in-installer) "mkfs.fat" "-F16" partition))
(define (create-fat32-file-system partition) (define (create-fat32-file-system partition)
"Create a fat32 file-system for PARTITION file-name." "Create a fat32 file-system for PARTITION file-name."
((run-command-in-installer) "mkfs.fat" "-F32" partition)) ((%run-command-in-installer) "mkfs.fat" "-F32" partition))
(define (create-jfs-file-system partition) (define (create-jfs-file-system partition)
"Create a JFS file-system for PARTITION file-name." "Create a JFS file-system for PARTITION file-name."
((run-command-in-installer) "jfs_mkfs" "-f" partition)) ((%run-command-in-installer) "jfs_mkfs" "-f" partition))
(define (create-ntfs-file-system partition) (define (create-ntfs-file-system partition)
"Create a JFS file-system for PARTITION file-name." "Create a JFS file-system for PARTITION file-name."
((run-command-in-installer) "mkfs.ntfs" "-F" "-f" partition)) ((%run-command-in-installer) "mkfs.ntfs" "-F" "-f" partition))
(define (create-xfs-file-system partition) (define (create-xfs-file-system partition)
"Create an XFS file-system for PARTITION file-name." "Create an XFS file-system for PARTITION file-name."
((run-command-in-installer) "mkfs.xfs" "-f" partition)) ((%run-command-in-installer) "mkfs.xfs" "-f" partition))
(define (create-swap-partition partition) (define (create-swap-partition partition)
"Set up swap area on PARTITION file-name." "Set up swap area on PARTITION file-name."
((run-command-in-installer) "mkswap" "-f" partition)) ((%run-command-in-installer) "mkswap" "-f" partition))
(define (call-with-luks-key-file password proc) (define (call-with-luks-key-file password proc)
"Write PASSWORD in a temporary file and pass it to PROC as argument." "Write PASSWORD in a temporary file and pass it to PROC as argument."
@ -1246,9 +1247,9 @@ USER-PARTITION if it is encrypted, or the plain file-name otherwise."
(lambda (key-file) (lambda (key-file)
(installer-log-line "formatting and opening LUKS entry ~s at ~s" (installer-log-line "formatting and opening LUKS entry ~s at ~s"
label file-name) label file-name)
((run-command-in-installer) "cryptsetup" "-q" "luksFormat" ((%run-command-in-installer) "cryptsetup" "-q" "luksFormat"
file-name key-file) file-name key-file)
((run-command-in-installer) "cryptsetup" "open" "--type" "luks" ((%run-command-in-installer) "cryptsetup" "open" "--type" "luks"
"--key-file" key-file file-name label))))) "--key-file" key-file file-name label)))))
(define (luks-ensure-open user-partition) (define (luks-ensure-open user-partition)
@ -1262,14 +1263,14 @@ USER-PARTITION if it is encrypted, or the plain file-name otherwise."
(lambda (key-file) (lambda (key-file)
(installer-log-line "opening LUKS entry ~s at ~s" (installer-log-line "opening LUKS entry ~s at ~s"
label file-name) label file-name)
((run-command-in-installer) "cryptsetup" "open" "--type" "luks" ((%run-command-in-installer) "cryptsetup" "open" "--type" "luks"
"--key-file" key-file file-name label)))))) "--key-file" key-file file-name label))))))
(define (luks-close user-partition) (define (luks-close user-partition)
"Close the encrypted partition pointed by USER-PARTITION." "Close the encrypted partition pointed by USER-PARTITION."
(let ((label (user-partition-crypt-label user-partition))) (let ((label (user-partition-crypt-label user-partition)))
(installer-log-line "closing LUKS entry ~s" label) (installer-log-line "closing LUKS entry ~s" label)
((run-command-in-installer) "cryptsetup" "close" label))) ((%run-command-in-installer) "cryptsetup" "close" label)))
(define (format-user-partitions user-partitions) (define (format-user-partitions user-partitions)
"Format the <user-partition> records in USER-PARTITIONS list with "Format the <user-partition> records in USER-PARTITIONS list with

6
gnu/installer/utils.scm
View file

@ -50,7 +50,7 @@
run-external-command-with-handler/tty run-external-command-with-handler/tty
run-external-command-with-line-hooks run-external-command-with-line-hooks
run-command run-command
run-command-in-installer %run-command-in-installer
syslog-port syslog-port
%syslog-line-hook %syslog-line-hook
@ -222,13 +222,13 @@ in a pseudoterminal."
(pause) (pause)
succeeded?) succeeded?)
(define run-command-in-installer (define %run-command-in-installer
(make-parameter (make-parameter
(lambda (. args) (lambda (. args)
(raise (raise
(condition (condition
(&serious) (&serious)
(&message (message "run-command-in-installer not set"))))))) (&message (message "%run-command-in-installer not set")))))))
;;; ;;;