From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id KG3hEPPrBmCyQwAA0tVLHw (envelope-from ) for ; Tue, 19 Jan 2021 14:25:55 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id MMmkDPPrBmAwXQAA1q6Kng (envelope-from ) for ; Tue, 19 Jan 2021 14:25:55 +0000 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 98B389404C4 for ; Tue, 19 Jan 2021 14:25:54 +0000 (UTC) Received: from localhost ([::1]:50316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1rxB-0004Xy-Js for larch@yhetil.org; Tue, 19 Jan 2021 09:25:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1rvO-0001zY-95 for guix-patches@gnu.org; Tue, 19 Jan 2021 09:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38283) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1rvO-0002Fz-0N for guix-patches@gnu.org; Tue, 19 Jan 2021 09:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l1rvN-0005ov-SZ for guix-patches@gnu.org; Tue, 19 Jan 2021 09:24:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45933] system: Rename 'disk-image' command to 'image'. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Jan 2021 14:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45933 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Mathieu Othacehe Received: via spool by 45933-submit@debbugs.gnu.org id=B45933.161106623322356 (code B ref 45933); Tue, 19 Jan 2021 14:24:01 +0000 Received: (at 45933) by debbugs.gnu.org; 19 Jan 2021 14:23:53 +0000 Received: from localhost ([127.0.0.1]:49829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1rvE-0005oW-M7 for submit@debbugs.gnu.org; Tue, 19 Jan 2021 09:23:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1rvB-0005oI-Rq for 45933@debbugs.gnu.org; Tue, 19 Jan 2021 09:23:52 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:52546) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1rv6-0002Cz-N1 for 45933@debbugs.gnu.org; Tue, 19 Jan 2021 09:23:44 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=43000 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1l1rv5-0000wa-QL; Tue, 19 Jan 2021 09:23:44 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87h7nfx2p8.fsf@gnu.org> Date: Tue, 19 Jan 2021 15:23:42 +0100 In-Reply-To: <87h7nfx2p8.fsf@gnu.org> (Mathieu Othacehe's message of "Sun, 17 Jan 2021 11:44:35 +0100") Message-ID: <87k0s9huoh.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Cc: 45933@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.85 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 98B389404C4 X-Spam-Score: -2.85 X-Migadu-Scanner: scn0.migadu.com X-TUID: xBlhPAveONbN Hi! Mathieu Othacehe skribis: > With the new image API, the disk-image command is able to produce raw > disk-images, ISO9660 images and maybe in the future docker images. Hence > I feel that 'disk-image' in not the better command name anymore. +1 > This patch renames the command name to 'image' and deprecates the old > command. I think it would also be nice for this command to be able to > process both files as well as files, this > way: > > gnu system image my-os.scm > gnu system image my-image.scm > > > When my-image.scm could be for instance: > [...] > (image > (inherit > (os->image my-os #:type pinebook-pro-image-type)) > (name 'my-pinebook-pro-raw-image)) That makes sense to me. IIUC, the semantics could be: 1. If given an OS, wrap it in a =E2=80=9Cdefault=E2=80=9D image. 2. Interpret command-line options like =E2=80=98--file-system-type=E2=80= =99 as changes to the . How does that sound? >>>From c58ced3271ef1a62642a3011f0a8020039a008bd Mon Sep 17 00:00:00 2001 > From: Mathieu Othacehe > Date: Sun, 17 Jan 2021 11:32:51 +0100 > Subject: [PATCH] system: Rename 'disk-image' command 'image'. > > * guix/scripts/system.scm (system-derivation-for-action): Rename 'disk-im= age' > command 'image'. Warn when using the now deprecated 'disk-image' command. > (show-help): Adapt accordingly. > (guix-system): Ditto. > * tests/guix-system.sh: Ditto. > * gnu/system/examples/bare-hurd.tmpl: Ditto. > * doc/guix.texi: Adapt documentation. ^ Nitpick: please specify the Texinfo node name(s) here. > + ((image disk-image) > (let* ((base-image (os->image os #:type image-type)) > (base-target (image-target base-image))) > + (when (eq? action 'disk-image) > + (warning (G_ "'disk-image' is deprecated, use 'image' instead= ~%"))) ^ Rather semicolon (I think). Otherwise LGTM, thanks! Ludo=E2=80=99.