From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Othacehe Subject: bug#35783: Guile-Parted crashes the installer on i686-linux Date: Sat, 18 May 2019 12:25:38 +0200 Message-ID: <87ftpchxel.fsf@gmail.com> References: <87h89syidd.fsf@gnu.org> <877eaoydw8.fsf@gnu.org> <87h89shzyq.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([209.51.188.92]:49452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hRwXV-0000Qt-5D for bug-guix@gnu.org; Sat, 18 May 2019 06:26:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hRwXT-0000eG-LR for bug-guix@gnu.org; Sat, 18 May 2019 06:26:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46312) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hRwXR-0000dc-Ur for bug-guix@gnu.org; Sat, 18 May 2019 06:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hRwXR-0005zv-RE for bug-guix@gnu.org; Sat, 18 May 2019 06:26:01 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-reply-to: <87h89shzyq.fsf@gmail.com> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 35783@debbugs.gnu.org --=-=-= Content-Type: text/plain With this almost indentical patch, disk partitioning seems fine with and without existing esp partition on x64. I'll try to run more tests. Mathieu --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-draft-Fix-esp-user-partition-creation.patch >From 1e0734c4829725cdee6cab3cb05332ffd2a36a57 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 18 May 2019 11:25:09 +0200 Subject: [PATCH] draft: Fix esp user-partition creation. --- gnu/installer/newt/partition.scm | 5 +---- gnu/installer/parted.scm | 12 ++++++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index f8e318fa0d..cd9d46316a 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -752,10 +752,7 @@ by pressing the Exit button.~%~%"))) (disk-commit disk) disk))) (scheme (symbol-append method '- (run-scheme-page))) - (user-partitions (append - (auto-partition! disk #:scheme scheme) - (create-special-user-partitions - (disk-partitions disk))))) + (user-partitions (auto-partition! disk #:scheme scheme))) (run-disk-page (list disk) user-partitions #:guided? #t))) ((eq? method 'manual) diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm index 4ccc0b1f51..196fa99cf4 100644 --- a/gnu/installer/parted.scm +++ b/gnu/installer/parted.scm @@ -1001,10 +1001,14 @@ swap partition, a root partition and a home partition." (mount-point "/home"))))))) (new-partitions* (force-user-partitions-formatting new-partitions))) - (create-adjacent-partitions! disk - new-partitions* - #:last-partition-end - (or end-esp-partition 0))))) + (append + (if esp-partition + (list (partition->user-partition esp-partition)) + '()) + (create-adjacent-partitions! disk + new-partitions* + #:last-partition-end + (or end-esp-partition 0)))))) ;; -- 2.17.1 --=-=-=--