me
/
guix
Archived
1
0
Fork 0
Code

installer: parted: Do not call BLKRRPART on loop devices. 

* gnu/installer/parted.scm (with-delay-device-in-use?): Return immediately if
the file-name passed as argument designates a loop device.
master
Mathieu Othacehe 2019-01-01 19:23:21 +01:00 committed by Ludovic Courtès
parent 44b2d31c28
commit f297c213a1
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/installer/parted.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -31,6 +31,7 @@
#:use-module (guix i18n) #:use-module (guix i18n)
#:use-module (parted) #:use-module (parted)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 regex)
#:use-module (rnrs io ports) #:use-module (rnrs io ports)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
@ -339,12 +340,14 @@ PARTED-OBJECT field equals PARTITION, return #f if not found."
(define (with-delay-device-in-use? file-name) (define (with-delay-device-in-use? file-name)
"Call DEVICE-IN-USE? with a few retries, as the first re-read will often "Call DEVICE-IN-USE? with a few retries, as the first re-read will often
fail. See rereadpt function in wipefs.c of util-linux for an explanation." fail. See rereadpt function in wipefs.c of util-linux for an explanation."
;; Kernel always return EINVAL for BLKRRPART on loopdevices.
(and (not (string-match "/dev/loop*" file-name))
(let loop ((try 4)) (let loop ((try 4))
(usleep 250000) (usleep 250000)
(let ((in-use? (device-in-use? file-name))) (let ((in-use? (device-in-use? file-name)))
(if (and in-use? (> try 0)) (if (and in-use? (> try 0))
(loop (- try 1)) (loop (- try 1))
in-use?)))) in-use?)))))
(define* (force-device-sync device) (define* (force-device-sync device)
"Force a flushing of the given DEVICE." "Force a flushing of the given DEVICE."