me/guix
Archived
1
0
Fork 0
Code Activity

installer: "formating" → "formatting".

Browse source 
* gnu/installer/newt/partition.scm,
gnu/installer/parted.scm: Replace "formating" with "formatting".
This commit is contained in:
Ludovic Courtès 2019-01-16 19:20:26 +01:00
parent 938ee975af
commit 85caf5f323
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/installer/newt/partition.scm
View file

@ -52,10 +52,10 @@
#:button-callback-procedure button-exit-action))) #:button-callback-procedure button-exit-action)))
(car result))) (car result)))
(define (draw-formating-page) (define (draw-formatting-page)
"Draw a page to indicate partitions are being formated." "Draw a page to indicate partitions are being formated."
(draw-info-page (draw-info-page
(format #f (G_ "Partition formating is in progress, please wait.")) (format #f (G_ "Partition formatting is in progress, please wait."))
(G_ "Preparing partitions"))) (G_ "Preparing partitions")))
(define (run-device-page devices) (define (run-device-page devices)
@ -288,13 +288,13 @@ by USER-PART, if it is applicable for the partition type."
(G_ "Encryption label"))))) (G_ "Encryption label")))))
(user-partition (user-partition
(inherit target-user-partition) (inherit target-user-partition)
(need-formating? #t) (need-formatting? #t)
(crypt-label new-label)))) (crypt-label new-label))))
((need-formating?) ((need-formatting?)
(user-partition (user-partition
(inherit target-user-partition) (inherit target-user-partition)
(need-formating? (need-formatting?
(not (user-partition-need-formating? (not (user-partition-need-formatting?
target-user-partition))))) target-user-partition)))))
((size) ((size)
(let* ((old-size (user-partition-size target-user-partition)) (let* ((old-size (user-partition-size target-user-partition))
@ -392,7 +392,7 @@ partition. Leave this field empty if you don't want to set a mounting point.")
(and new-partition (and new-partition
(user-partition (user-partition
(inherit new-user-partition) (inherit new-user-partition)
(need-formating? #t) (need-formatting? #t)
(file-name (partition-get-path new-partition)) (file-name (partition-get-path new-partition))
(disk-file-name (device-path device)) (disk-file-name (device-path device))
(parted-object new-partition)))) (parted-object new-partition))))
@ -758,8 +758,8 @@ by pressing the Exit button.~%~%")))
(user-partitions (run-page non-install-devices)) (user-partitions (run-page non-install-devices))
(user-partitions-with-pass (prompt-luks-passwords (user-partitions-with-pass (prompt-luks-passwords
user-partitions)) user-partitions))
(form (draw-formating-page))) (form (draw-formatting-page)))
;; Make sure the disks are not in use before proceeding to formating. ;; Make sure the disks are not in use before proceeding to formatting.
(free-parted non-install-devices) (free-parted non-install-devices)
(format-user-partitions user-partitions-with-pass) (format-user-partitions user-partitions-with-pass)
(destroy-form-and-pop form) (destroy-form-and-pop form)

26
gnu/installer/parted.scm
View file

@ -55,7 +55,7 @@
user-partition-start user-partition-start
user-partition-end user-partition-end
user-partition-mount-point user-partition-mount-point
user-partition-need-formating? user-partition-need-formatting?
user-partition-parted-object user-partition-parted-object
find-esp-partition find-esp-partition
@ -154,7 +154,7 @@
(default #f)) (default #f))
(mount-point user-partition-mount-point ;string (mount-point user-partition-mount-point ;string
(default #f)) (default #f))
(need-formating? user-partition-need-formating? ; boolean (need-formatting? user-partition-need-formatting? ; boolean
(default #f)) (default #f))
(parted-object user-partition-parted-object ; <partition> from parted (parted-object user-partition-parted-object ; <partition> from parted
(default #f))) (default #f)))
@ -541,7 +541,7 @@ determined by MAX-LENGTH-COLUMN procedure."
(fs-type-name (user-fs-type-name fs-type)) (fs-type-name (user-fs-type-name fs-type))
(bootable? (user-partition-bootable? user-partition)) (bootable? (user-partition-bootable? user-partition))
(esp? (user-partition-esp? user-partition)) (esp? (user-partition-esp? user-partition))
(need-formating? (user-partition-need-formating? user-partition)) (need-formatting? (user-partition-need-formatting? user-partition))
(crypt-label (user-partition-crypt-label user-partition)) (crypt-label (user-partition-crypt-label user-partition))
(size (user-partition-size user-partition)) (size (user-partition-size user-partition))
(mount-point (user-partition-mount-point user-partition))) (mount-point (user-partition-mount-point user-partition)))
@ -585,9 +585,9 @@ determined by MAX-LENGTH-COLUMN procedure."
,@(if (or (freespace-partition? partition) ,@(if (or (freespace-partition? partition)
(eq? fs-type 'swap)) (eq? fs-type 'swap))
'() '()
`((need-formating? `((need-formatting?
. ,(string-append "Format the partition? : " . ,(string-append "Format the partition? : "
(if need-formating? "Yes" "No"))))) (if need-formatting? "Yes" "No")))))
,@(if (or (eq? type 'extended) ,@(if (or (eq? type 'extended)
(eq? fs-type 'swap)) (eq? fs-type 'swap))
'() '()
@ -871,13 +871,13 @@ partition."
(error (error
(format #f "Unable to create partition ~a~%" name))))))))) (format #f "Unable to create partition ~a~%" name)))))))))
(define (force-user-partitions-formating user-partitions) (define (force-user-partitions-formatting user-partitions)
"Set the NEED-FORMATING? fields to #t on all <user-partition> records of "Set the NEED-FORMATING? fields to #t on all <user-partition> records of
USER-PARTITIONS list and return the updated list." USER-PARTITIONS list and return the updated list."
(map (lambda (p) (map (lambda (p)
(user-partition (user-partition
(inherit p) (inherit p)
(need-formating? #t))) (need-formatting? #t)))
user-partitions)) user-partitions))
(define* (auto-partition disk (define* (auto-partition disk
@ -992,7 +992,7 @@ swap partition, a root partition and a home partition."
(crypt-label (and encrypted? "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-formatting
new-partitions))) new-partitions)))
(create-adjacent-partitions disk (create-adjacent-partitions disk
new-partitions* new-partitions*
@ -1091,8 +1091,8 @@ USER-PARTITION if it is encrypted, or the plain file-name otherwise."
NEED-FORMATING? field set to #t." NEED-FORMATING? field set to #t."
(for-each (for-each
(lambda (user-partition) (lambda (user-partition)
(let* ((need-formating? (let* ((need-formatting?
(user-partition-need-formating? user-partition)) (user-partition-need-formatting? user-partition))
(type (user-partition-type user-partition)) (type (user-partition-type user-partition))
(crypt-label (user-partition-crypt-label user-partition)) (crypt-label (user-partition-crypt-label user-partition))
(file-name (user-partition-upper-file-name user-partition)) (file-name (user-partition-upper-file-name user-partition))
@ -1102,11 +1102,11 @@ NEED-FORMATING? field set to #t."
(case fs-type (case fs-type
((ext4) ((ext4)
(and need-formating? (and need-formatting?
(not (eq? type 'extended)) (not (eq? type 'extended))
(create-ext4-file-system file-name))) (create-ext4-file-system file-name)))
((fat32) ((fat32)
(and need-formating? (and need-formatting?
(not (eq? type 'extended)) (not (eq? type 'extended))
(create-fat32-file-system file-name))) (create-fat32-file-system file-name)))
((swap) ((swap)
@ -1293,7 +1293,7 @@ from (gnu system mapped-devices) and return it."
(define (free-parted devices) (define (free-parted devices)
"Deallocate memory used for DEVICES in parted, force sync them and wait for "Deallocate memory used for DEVICES in parted, force sync them and wait for
the devices not to be used before returning." the devices not to be used before returning."
;; XXX: Formating and further operations on disk partition table may fail ;; XXX: Formatting and further operations on disk partition table may fail
;; because the partition table changes are not synced, or because the device ;; because the partition table changes are not synced, or because the device
;; is still in use, even if parted should have finished editing ;; is still in use, even if parted should have finished editing
;; partitions. This is not well understood, but syncing devices and waiting ;; partitions. This is not well understood, but syncing devices and waiting