From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id UCdZNA7S4mGHxgAAgWs5BA (envelope-from ) for ; Sat, 15 Jan 2022 14:54:22 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id OOE7LQ7S4mF18wAAG6o9tA (envelope-from ) for ; Sat, 15 Jan 2022 14:54:22 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7A3992D5FF for ; Sat, 15 Jan 2022 14:54:22 +0100 (CET) Received: from localhost ([::1]:44060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8jVd-0000nh-Oy for larch@yhetil.org; Sat, 15 Jan 2022 08:54:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8jSV-0005Ev-Er for guix-patches@gnu.org; Sat, 15 Jan 2022 08:51:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46626) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n8jSU-0004Fe-6S for guix-patches@gnu.org; Sat, 15 Jan 2022 08:51:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n8jSU-0001rY-5b for guix-patches@gnu.org; Sat, 15 Jan 2022 08:51:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53063] [PATCH v2 wip-harden-installer 10/18] installer: Raise condition when mklabel fails. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Jan 2022 13:51:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53063 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: 53063@debbugs.gnu.org, ludo@gnu.org, Josselin Poiret Received: via spool by 53063-submit@debbugs.gnu.org id=B53063.16422546447044 (code B ref 53063); Sat, 15 Jan 2022 13:51:06 +0000 Received: (at 53063) by debbugs.gnu.org; 15 Jan 2022 13:50:44 +0000 Received: from localhost ([127.0.0.1]:39514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8jS7-0001pS-Ov for submit@debbugs.gnu.org; Sat, 15 Jan 2022 08:50:44 -0500 Received: from jpoiret.xyz ([206.189.101.64]:48812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8jRw-0001md-5y for 53063@debbugs.gnu.org; Sat, 15 Jan 2022 08:50:32 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 86F0F184F8C; Sat, 15 Jan 2022 13:50:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1642254631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j1+E8H+8d39neV6FFL1ihLD+RKMyC2d6miPvlu5wODs=; b=NUZhwSFoLRaoxWDJ3nrzztwsI8X9KVDgSjzGg4OS9Hx3ZYrC7QEPZS/rj8YX8mHip8eshm y2OodG4RrKHnIhjngN3jq0w1wlTnpHJrNPrTTLYTkkoNJHcUE8MHuVzJScecMXwaqGaa1s QtMYo2a7uy1FUoFsD8JbeAG9JHu77Uue2r/XxwthxowF4JCK72GfXXtoLatgHdXxyY1WZc vF2propvGSKhw1uh/eWcnTHfOXKca6Y3XO/Iu2vJWUE4z0iv37orsNO50243u6eDkN572Q zNBeVNv6aT93kLWpcf/rSV6J1i/fQ2NyqKeY7ibTAHPnj0qNMmBocPmiPCXS+A== Date: Sat, 15 Jan 2022 14:50:03 +0100 Message-Id: <20220115135011.5817-11-dev@jpoiret.xyz> In-Reply-To: <20220115135011.5817-1-dev@jpoiret.xyz> References: <8735lz4xsv.fsf@gnu.org> <20220115135011.5817-1-dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches From: Josselin Poiret via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1642254862; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=j1+E8H+8d39neV6FFL1ihLD+RKMyC2d6miPvlu5wODs=; b=jDeNplA7nPDQ9hGhYIvf4LDgD/yJA75hiFmLNK22OuNg8wNkrlfzBYVIvMoEkrWt6EThqa RHkB56DqwViOTU2Dk55NoIJbaIcWXuNIUsKZPDHepMQ/oxNJYTxUOoUIt1nG73FUm4KMiX wZKTdV7EWtBzQnM9UeuTeAp4bCQBXSvUy+HdLHeFN0SOuvWZd88qvcNUfj6bmfVEPZDcy4 FRcMJfqEhEZI+0kOQ3ziH/dK37HvIZdJiHW/eBCHhtu0b345E77qfiEo3Wa0SlIpGi8/j9 5rDsoSYZ4jVsQeZxanETPqnL/ugTWf8FVVufMGDDM85JFdxbETWeY5hHqp6KTg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1642254862; a=rsa-sha256; cv=none; b=rxdrHvSsZ3CFjfIhmjIV8GJISHWIN/QqAULhjbSGLYm0sR2s3rn7g8PHNKbxAIZCu7MoR4 lSEu+GrJ7k6JohArvEnJALS6KQHZ0aivKww3XqybSpDBZUxnp/3Yqn1fAooe/q7dChHpuL 7BJl5xSeqfg44gUFZHok/u5oG7vAw1YaBPz0SWzCBkGSwMpODgzAr1g4FLcUcVpMkrHEzM 1Zh0ms45JPOr31w1rjE9HdZeNZpTuKE3bR9Gd3ELbkJw8mh8zU9i83sas3bK+j5+z53auT Kc8MukBvh5rpVBd1iQP+6BefeflrxzEGh16olWQz/E4eWp565STOzHIln7zIEw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=NUZhwSFo; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.13 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=NUZhwSFo; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 7A3992D5FF X-Spam-Score: -3.13 X-Migadu-Scanner: scn1.migadu.com X-TUID: bLxGT6S/px28 * gnu/installer/parted.scm (mklabel): Do it. --- gnu/installer/parted.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm index c8bb73ee64..e33ef5f8fd 100644 --- a/gnu/installer/parted.scm +++ b/gnu/installer/parted.scm @@ -635,8 +635,14 @@ (define (user-partition-description user-partition) (define (mklabel device type-name) "Create a partition table on DEVICE. TYPE-NAME is the type of the partition table, \"msdos\" or \"gpt\"." - (let ((type (disk-type-get type-name))) - (disk-new-fresh device type))) + (let* ((type (disk-type-get type-name)) + (disk (disk-new-fresh device type))) + (or disk + (raise + (condition + (&error) + (&message (message (format #f "Cannot create partition table of type +~a on device ~a." type-name (device-path device))))))))) ;; -- 2.34.0