From: Mathieu Othacehe <othacehe@gnu.org>
To: Josselin Poiret <dev@jpoiret.xyz>
Cc: 51878@debbugs.gnu.org
Subject: [bug#51878] [PATCH] installer: Rework installation device detection
Date: Thu, 25 Nov 2021 09:20:30 +0000 [thread overview]
Message-ID: <87y25cmw0x.fsf_-_@gnu.org> (raw)
In-Reply-To: <20211123221909.11142-1-dev@jpoiret.xyz> (Josselin Poiret's message of "Tue, 23 Nov 2021 22:19:09 +0000")
Hello Josselin,
Thanks for the v2!
> I didn't quite get your comment about filtering the `(devices)` list.
> In both cases, we use `remove`, but here I've factored out the predicate
> used for it.
I was not very clear sorry about that. I meant something like that seems
a little more concise:
--8<---------------cut here---------------start------------->8---
diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm
index 82b01d2ce1..ad7dd6bf91 100644
--- a/gnu/installer/parted.scm
+++ b/gnu/installer/parted.scm
@@ -366,19 +366,16 @@ (define the-installer-root-partition-path
;; we're booting from to determine if it is the installation
;; device.
(define (installation-device? device)
+ ;; When using CDROM based installation, the root partition path may be the
+ ;; device path.
(or (string=? the-installer-root-partition-path
(device-path device))
(let ((disk (disk-new device)))
(and disk
- (let loop ((partition #f))
- (let ((next-partition (disk-next-partition disk
- #:partition
- partition)))
- (and next-partition
- (or (string=? the-installer-root-partition-path
- (partition-get-path
- next-partition))
- (loop next-partition)))))))))
+ (any (lambda (partition)
+ (string=? the-installer-root-partition-path
+ (partition-get-path partition)))
+ (disk-partitions disk))))))
(remove installation-device? (devices)))
--8<---------------cut here---------------end--------------->8---
WDYT?
Thanks,
Mathieu
next prev parent reply other threads:[~2021-11-25 9:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 21:04 [bug#51878] [PATCH] installer: Rework installation device detection Josselin Poiret via Guix-patches via
2021-11-15 21:32 ` [bug#51878] [PATCH v2] " Josselin Poiret via Guix-patches via
2021-11-17 14:43 ` [bug#51878] [PATCH] " Mathieu Othacehe
2021-11-23 22:19 ` [bug#51878] [PATCH v2] " Josselin Poiret via Guix-patches via
2021-11-25 9:20 ` Mathieu Othacehe [this message]
2021-11-26 9:48 ` [bug#51878] [PATCH] " Josselin Poiret via Guix-patches via
2021-11-26 10:53 ` bug#51878: " Mathieu Othacehe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y25cmw0x.fsf_-_@gnu.org \
--to=othacehe@gnu.org \
--cc=51878@debbugs.gnu.org \
--cc=dev@jpoiret.xyz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.