nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

installer: Various renamings. 

1. s/partitionment/partitioning/
2. s/crypted/encrypted/

* gnu/installer.scm (installer-steps): Apply renamings.
* gnu/installer/newt/partition.scm (run-disk-page): ditto,
* gnu/installer/parted.scm (auto-partition): ditto,
(luks-format-and-open): ditto,
(luks-close): ditto,
(user-partitions->configuration): ditto.
This commit is contained in:
Mathieu Othacehe 2018-12-08 23:52:13 +09:00 committed by Ludovic Courtès
parent 59e8f3c3ac
commit 5737ba841b
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/installer.scm
View File

@ -209,11 +209,11 @@ selected keymap."
(compute (lambda _ (compute (lambda _
(#$keymap-step current-installer)))) (#$keymap-step current-installer))))
;; Run a partitionment tool allowing the user to modify ;; Run a partitioning tool allowing the user to modify
;; partition tables, partitions and their mount points. ;; partition tables, partitions and their mount points.
(installer-step (installer-step
(id 'partition) (id 'partition)
(description (G_ "Partitionment")) (description (G_ "Partitioning"))
(compute (lambda _ (compute (lambda _
((installer-partition-page current-installer)))) ((installer-partition-page current-installer))))
(configuration-formatter user-partitions->configuration)) (configuration-formatter user-partitions->configuration))

2
gnu/installer/newt/partition.scm
View File

@ -636,7 +636,7 @@ partition, select a free space area and press ENTER.
At least one partition must have its mounting point set to '/'.")) At least one partition must have its mounting point set to '/'."))
(guided-info-text (format #f (G_ "This is the proposed \ (guided-info-text (format #f (G_ "This is the proposed \
partitionment. It is still possible to edit it or to go back to install menu \ partitioning. It is still possible to edit it or to go back to install menu \
by pressing the Exit button.~%~%"))) by pressing the Exit button.~%~%")))
(result (result
(run-listbox-selection-page (run-listbox-selection-page

28
gnu/installer/parted.scm
View File

@ -940,12 +940,12 @@ swap partition, a root partition and a home partition."
(new-partitions (new-partitions
(cond (cond
((or (eq? scheme 'entire-root) ((or (eq? scheme 'entire-root)
(eq? scheme 'entire-crypted-root)) (eq? scheme 'entire-encrypted-root))
(let ((crypted? (eq? scheme 'entire-crypted-root))) (let ((encrypted? (eq? scheme 'entire-encrypted-root)))
`(,@(if start-partition `(,@(if start-partition
`(,start-partition) `(,start-partition)
'()) '())
,@(if crypted? ,@(if encrypted?
'() '()
`(,(user-partition `(,(user-partition
(fs-type 'swap) (fs-type 'swap)
@ -953,19 +953,19 @@ swap partition, a root partition and a home partition."
,(user-partition ,(user-partition
(fs-type 'ext4) (fs-type 'ext4)
(bootable? has-extended?) (bootable? has-extended?)
(crypt-label (and crypted? "cryptroot")) (crypt-label (and encrypted? "cryptroot"))
(size "100%") (size "100%")
(mount-point "/"))))) (mount-point "/")))))
((or (eq? scheme 'entire-root-home) ((or (eq? scheme 'entire-root-home)
(eq? scheme 'entire-crypted-root-home)) (eq? scheme 'entire-encrypted-root-home))
(let ((crypted? (eq? scheme 'entire-crypted-root-home))) (let ((encrypted? (eq? scheme 'entire-encrypted-root-home)))
`(,@(if start-partition `(,@(if start-partition
`(,start-partition) `(,start-partition)
'()) '())
,(user-partition ,(user-partition
(fs-type 'ext4) (fs-type 'ext4)
(bootable? has-extended?) (bootable? has-extended?)
(crypt-label (and crypted? "cryptroot")) (crypt-label (and encrypted? "cryptroot"))
(size "33%") (size "33%")
(mount-point "/")) (mount-point "/"))
,@(if has-extended? ,@(if has-extended?
@ -973,7 +973,7 @@ swap partition, a root partition and a home partition."
(type 'extended) (type 'extended)
(size "100%"))) (size "100%")))
'()) '())
,@(if crypted? ,@(if encrypted?
'() '()
`(,(user-partition `(,(user-partition
(type (if has-extended? (type (if has-extended?
@ -986,7 +986,7 @@ swap partition, a root partition and a home partition."
'logical 'logical
'normal)) 'normal))
(fs-type 'ext4) (fs-type 'ext4)
(crypt-label (and crypted? "crypthome")) (crypt-label (and encrypted? "crypthome"))
(size "100%") (size "100%")
(mount-point "/home"))))))) (mount-point "/home")))))))
(new-partitions* (force-user-partitions-formating (new-partitions* (force-user-partitions-formating
@ -1067,7 +1067,7 @@ if it is encrypted, or the plain path otherwise."
path))) path)))
(define (luks-format-and-open user-partition) (define (luks-format-and-open user-partition)
"Format and open the crypted partition pointed by USER-PARTITION." "Format and open the encrypted partition pointed by USER-PARTITION."
(let* ((path (user-partition-path user-partition)) (let* ((path (user-partition-path user-partition))
(label (user-partition-crypt-label user-partition)) (label (user-partition-crypt-label user-partition))
(password (user-partition-crypt-password user-partition))) (password (user-partition-crypt-password user-partition)))
@ -1079,7 +1079,7 @@ if it is encrypted, or the plain path otherwise."
"--key-file" key-file path label))))) "--key-file" key-file path label)))))
(define (luks-close user-partition) (define (luks-close user-partition)
"Close the crypted 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)))
(system* "cryptsetup" "close" label))) (system* "cryptsetup" "close" label)))
@ -1260,17 +1260,17 @@ from (gnu system mapped-devices) and return it."
"Return the configuration field for USER-PARTITIONS." "Return the configuration field for USER-PARTITIONS."
(let* ((swap-user-partitions (find-swap-user-partitions user-partitions)) (let* ((swap-user-partitions (find-swap-user-partitions user-partitions))
(swap-devices (map user-partition-path swap-user-partitions)) (swap-devices (map user-partition-path swap-user-partitions))
(crypted-partitions (encrypted-partitions
(filter user-partition-crypt-label user-partitions))) (filter user-partition-crypt-label user-partitions)))
`(,@(if (null? swap-devices) `(,@(if (null? swap-devices)
'() '()
`((swap-devices (list ,@swap-devices)))) `((swap-devices (list ,@swap-devices))))
(bootloader ,@(bootloader-configuration user-partitions)) (bootloader ,@(bootloader-configuration user-partitions))
,@(if (null? crypted-partitions) ,@(if (null? encrypted-partitions)
'() '()
`((mapped-devices `((mapped-devices
(list ,@(map user-partition->mapped-device (list ,@(map user-partition->mapped-device
crypted-partitions))))) encrypted-partitions)))))
(file-systems (cons* (file-systems (cons*
,@(user-partitions->file-systems user-partitions) ,@(user-partitions->file-systems user-partitions)
%base-file-systems))))) %base-file-systems)))))